diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-07-29 23:17:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-07-29 23:17:34 -0700 |
| commit | 845c28d8ca8fb5a56829b38c0215f88b90b5d083 (patch) | |
| tree | f027b7cc7977bea4a731eef75f86e6cf8bbd15e2 /include | |
| parent | 99202312a6e44bbe29355c5706064fb71dd33db9 (diff) | |
| parent | 91096a174dd15381348979208f2cb6bbfab9d92b (diff) | |
| download | history-845c28d8ca8fb5a56829b38c0215f88b90b5d083.tar.gz | |
Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6
into nuts.davemloft.net:/disk1/BK/sparc-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/openpromio.h | 5 | ||||
| -rw-r--r-- | include/asm-sparc64/openpromio.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc/openpromio.h b/include/asm-sparc/openpromio.h index 6e32823ab4e275..917fb8e9c63382 100644 --- a/include/asm-sparc/openpromio.h +++ b/include/asm-sparc/openpromio.h @@ -1,6 +1,7 @@ #ifndef _SPARC_OPENPROMIO_H #define _SPARC_OPENPROMIO_H +#include <linux/compiler.h> #include <linux/ioctl.h> #include <linux/types.h> @@ -52,9 +53,9 @@ struct opiocdesc { int op_nodeid; /* PROM Node ID (value-result) */ int op_namelen; /* Length of op_name. */ - char *op_name; /* Pointer to the property name. */ + char __user *op_name; /* Pointer to the property name. */ int op_buflen; /* Length of op_buf (value-result) */ - char *op_buf; /* Pointer to buffer. */ + char __user *op_buf; /* Pointer to buffer. */ }; #define OPIOCGET _IOWR('O', 1, struct opiocdesc) diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h index a5b88e9d99877c..847ce2326ad5fb 100644 --- a/include/asm-sparc64/openpromio.h +++ b/include/asm-sparc64/openpromio.h @@ -1,6 +1,7 @@ #ifndef _SPARC64_OPENPROMIO_H #define _SPARC64_OPENPROMIO_H +#include <linux/compiler.h> #include <linux/ioctl.h> #include <linux/types.h> |