diff options
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat-arvo.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat-kone.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat-koneplus.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat-kovaplus.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat-pyra.c | 2 | ||||
| -rw-r--r-- | drivers/hid/hid-roccat.c | 2 | ||||
| -rw-r--r-- | include/linux/hid-roccat.h (renamed from include/linux/roccat.h) | 0 |
8 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index b0f1fa0770d1..e68543f767d5 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
| @@ -133,7 +133,7 @@ Code Seq#(hex) Include File Comments | |||
| 133 | 'H' C0-DF net/bluetooth/hidp/hidp.h conflict! | 133 | 'H' C0-DF net/bluetooth/hidp/hidp.h conflict! |
| 134 | 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! | 134 | 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! |
| 135 | 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! | 135 | 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! |
| 136 | 'H' F1 linux/roccat.h <mailto:erazor_de@users.sourceforge.net> | 136 | 'H' F1 linux/hid-roccat.h <mailto:erazor_de@users.sourceforge.net> |
| 137 | 'I' all linux/isdn.h conflict! | 137 | 'I' all linux/isdn.h conflict! |
| 138 | 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! | 138 | 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! |
| 139 | 'I' 40-4F linux/mISDNif.h conflict! | 139 | 'I' 40-4F linux/mISDNif.h conflict! |
diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c index 75f532f4d4cc..2307471d96dc 100644 --- a/drivers/hid/hid-roccat-arvo.c +++ b/drivers/hid/hid-roccat-arvo.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/hid.h> | 21 | #include <linux/hid.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/roccat.h> | 24 | #include <linux/hid-roccat.h> |
| 25 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
| 26 | #include "hid-roccat-common.h" | 26 | #include "hid-roccat-common.h" |
| 27 | #include "hid-roccat-arvo.h" | 27 | #include "hid-roccat-arvo.h" |
diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index d7497964a5b3..a57838d15267 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/hid.h> | 30 | #include <linux/hid.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | 32 | #include <linux/slab.h> |
| 33 | #include <linux/roccat.h> | 33 | #include <linux/hid-roccat.h> |
| 34 | #include "hid-ids.h" | 34 | #include "hid-ids.h" |
| 35 | #include "hid-roccat-common.h" | 35 | #include "hid-roccat-common.h" |
| 36 | #include "hid-roccat-kone.h" | 36 | #include "hid-roccat-kone.h" |
diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-koneplus.c index ac2010732495..a8e2117756ac 100644 --- a/drivers/hid/hid-roccat-koneplus.c +++ b/drivers/hid/hid-roccat-koneplus.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | #include <linux/hid.h> | 21 | #include <linux/hid.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | 23 | #include <linux/slab.h> |
| 24 | #include <linux/roccat.h> | 24 | #include <linux/hid-roccat.h> |
| 25 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
| 26 | #include "hid-roccat-common.h" | 26 | #include "hid-roccat-common.h" |
| 27 | #include "hid-roccat-koneplus.h" | 27 | #include "hid-roccat-koneplus.h" |
diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kovaplus.c index 4eeb62fb4e75..984be2f8967e 100644 --- a/drivers/hid/hid-roccat-kovaplus.c +++ b/drivers/hid/hid-roccat-kovaplus.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <linux/hid.h> | 20 | #include <linux/hid.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 23 | #include <linux/roccat.h> | 23 | #include <linux/hid-roccat.h> |
| 24 | #include "hid-ids.h" | 24 | #include "hid-ids.h" |
| 25 | #include "hid-roccat-common.h" | 25 | #include "hid-roccat-common.h" |
| 26 | #include "hid-roccat-kovaplus.h" | 26 | #include "hid-roccat-kovaplus.h" |
diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index 02a72433a712..160f481344f6 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #include <linux/hid.h> | 22 | #include <linux/hid.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
| 25 | #include <linux/roccat.h> | 25 | #include <linux/hid-roccat.h> |
| 26 | #include "hid-ids.h" | 26 | #include "hid-ids.h" |
| 27 | #include "hid-roccat-common.h" | 27 | #include "hid-roccat-common.h" |
| 28 | #include "hid-roccat-pyra.h" | 28 | #include "hid-roccat-pyra.h" |
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c index bbe294c0dd9b..5666e7587b18 100644 --- a/drivers/hid/hid-roccat.c +++ b/drivers/hid/hid-roccat.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/cdev.h> | 26 | #include <linux/cdev.h> |
| 27 | #include <linux/poll.h> | 27 | #include <linux/poll.h> |
| 28 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 29 | #include <linux/roccat.h> | 29 | #include <linux/hid-roccat.h> |
| 30 | 30 | ||
| 31 | #define ROCCAT_FIRST_MINOR 0 | 31 | #define ROCCAT_FIRST_MINOR 0 |
| 32 | #define ROCCAT_MAX_DEVICES 8 | 32 | #define ROCCAT_MAX_DEVICES 8 |
diff --git a/include/linux/roccat.h b/include/linux/hid-roccat.h index 24e1ca01f9a0..24e1ca01f9a0 100644 --- a/include/linux/roccat.h +++ b/include/linux/hid-roccat.h | |||