diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /drivers/hid/hid-dummy.c | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/hid/hid-dummy.c')
| -rw-r--r-- | drivers/hid/hid-dummy.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/hid-dummy.c b/drivers/hid/hid-dummy.c index e148f86fb58e..b4cc0f743d63 100644 --- a/drivers/hid/hid-dummy.c +++ b/drivers/hid/hid-dummy.c | |||
| @@ -43,6 +43,9 @@ static int __init hid_dummy_init(void) | |||
| 43 | #ifdef CONFIG_HID_MONTEREY_MODULE | 43 | #ifdef CONFIG_HID_MONTEREY_MODULE |
| 44 | HID_COMPAT_CALL_DRIVER(monterey); | 44 | HID_COMPAT_CALL_DRIVER(monterey); |
| 45 | #endif | 45 | #endif |
| 46 | #ifdef CONFIG_HID_NTRIG_MODULE | ||
| 47 | HID_COMPAT_CALL_DRIVER(ntrig); | ||
| 48 | #endif | ||
| 46 | #ifdef CONFIG_HID_PANTHERLORD_MODULE | 49 | #ifdef CONFIG_HID_PANTHERLORD_MODULE |
| 47 | HID_COMPAT_CALL_DRIVER(pantherlord); | 50 | HID_COMPAT_CALL_DRIVER(pantherlord); |
| 48 | #endif | 51 | #endif |
| @@ -58,6 +61,9 @@ static int __init hid_dummy_init(void) | |||
| 58 | #ifdef CONFIG_HID_SUNPLUS_MODULE | 61 | #ifdef CONFIG_HID_SUNPLUS_MODULE |
| 59 | HID_COMPAT_CALL_DRIVER(sunplus); | 62 | HID_COMPAT_CALL_DRIVER(sunplus); |
| 60 | #endif | 63 | #endif |
| 64 | #ifdef CONFIG_GREENASIA_FF_MODULE | ||
| 65 | HID_COMPAT_CALL_DRIVER(greenasia); | ||
| 66 | #endif | ||
| 61 | #ifdef CONFIG_THRUSTMASTER_FF_MODULE | 67 | #ifdef CONFIG_THRUSTMASTER_FF_MODULE |
| 62 | HID_COMPAT_CALL_DRIVER(thrustmaster); | 68 | HID_COMPAT_CALL_DRIVER(thrustmaster); |
| 63 | #endif | 69 | #endif |