diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-07-05 02:27:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-07-05 02:27:41 -0700 |
| commit | 3a4bc6655cf539cc142eba68b223dd4bce3bb82b (patch) | |
| tree | e691ef119899afbfe7904c5fd628f21699db2467 /fs | |
| parent | 5ade92b8d75798f314509605cf5c8e4082114aaf (diff) | |
| parent | 1dd7f7cab40e7e75f59e9fcff860b9bc65670e6e (diff) | |
| download | history-3a4bc6655cf539cc142eba68b223dd4bce3bb82b.tar.gz | |
Merge http://linux-mh.bkbits.net/bluetooth-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/compat_ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 0aa6df008de2c0..5b2198974cdf03 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1960,6 +1960,11 @@ static int do_blkgetsize64(unsigned int fd, unsigned int cmd, #define CMTPGETCONNLIST _IOR('C', 210, int) #define CMTPGETCONNINFO _IOR('C', 211, int) +#define HIDPCONNADD _IOW('H', 200, int) +#define HIDPCONNDEL _IOW('H', 201, int) +#define HIDPGETCONNLIST _IOR('H', 210, int) +#define HIDPGETCONNINFO _IOR('H', 211, int) + struct floppy_struct32 { compat_uint_t size; compat_uint_t sect; |