diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
| commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
| tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /drivers/char/mwave/mwavepub.h | |
| parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/char/mwave/mwavepub.h')
| -rw-r--r-- | drivers/char/mwave/mwavepub.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mwave/mwavepub.h b/drivers/char/mwave/mwavepub.h index f1f9da7a65c1..60c961ae23b4 100644 --- a/drivers/char/mwave/mwavepub.h +++ b/drivers/char/mwave/mwavepub.h | |||
| @@ -69,7 +69,7 @@ typedef struct _MW_ABILITIES { | |||
| 69 | typedef struct _MW_READWRITE { | 69 | typedef struct _MW_READWRITE { |
| 70 | unsigned short usDspAddress; /* The dsp address */ | 70 | unsigned short usDspAddress; /* The dsp address */ |
| 71 | unsigned long ulDataLength; /* The size in bytes of the data or user buffer */ | 71 | unsigned long ulDataLength; /* The size in bytes of the data or user buffer */ |
| 72 | void *pBuf; /* Input:variable sized buffer */ | 72 | void __user *pBuf; /* Input:variable sized buffer */ |
| 73 | } MW_READWRITE, *pMW_READWRITE; | 73 | } MW_READWRITE, *pMW_READWRITE; |
| 74 | 74 | ||
| 75 | #define IOCTL_MW_RESET _IO(MWAVE_MINOR,1) | 75 | #define IOCTL_MW_RESET _IO(MWAVE_MINOR,1) |