diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-10-22 02:07:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-10-22 02:07:19 -0700 |
| commit | 5e5495ddacb5838e9131598495695f86a411128d (patch) | |
| tree | f46eb710de560dffe66585300ddbe08264523ba0 /include/linux | |
| parent | 05d2e49cb69814247d4db76d3d90d1fada19bbeb (diff) | |
| parent | a45aa13b5759fba4366b0bc1aff7a007f701cce3 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/usb-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/proc_fs.h | 1 | ||||
| -rw-r--r-- | include/linux/ticable.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index c83dd15b728c..ba4c3255ccf7 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -193,6 +193,7 @@ static inline void proc_net_remove(const char *name) #define proc_root_driver NULL #define proc_net NULL +#define proc_bus NULL #define proc_net_fops_create(name, mode, fops) ({ (void)(mode), NULL; }) #define proc_net_create(name, mode, info) ({ (void)(mode), NULL; }) diff --git a/include/linux/ticable.h b/include/linux/ticable.h index 5aa24b451fba..8c2212086dcd 100644 --- a/include/linux/ticable.h +++ b/include/linux/ticable.h @@ -38,5 +38,7 @@ #define IOCTL_TIUSB_TIMEOUT _IOW('N', 0x20, int) /* set timeout */ #define IOCTL_TIUSB_RESET_DEVICE _IOW('N', 0x21, int) /* reset device */ #define IOCTL_TIUSB_RESET_PIPES _IOW('N', 0x22, int) /* reset both pipes*/ +#define IOCTL_TIUSB_GET_MAXPS _IOR('N', 0x23, int) /* max packet size */ +#define IOCTL_TIUSB_GET_DEVID _IOR('N', 0x24, int) /* get device type */ #endif /* TICABLE_H */ |