diff options
| author | Soeren Sonnenburg <kernel@nn7.de> | 2006-12-29 19:47:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 13:55:55 -0500 |
| commit | 10f549fa1538849548787879d96bbb3450f06117 (patch) | |
| tree | 4b26230ba720f735f159017ef80ff82caaa12583 | |
| parent | d8a82d7b0a22495023e90856e58639412a5ee3f7 (diff) | |
[PATCH] make fn_keys work again on power/macbooks
The apple fn keys don't work anymore with 2.6.20-rc1.
The reason is that USB_HID_POWERBOOK appears in several files although
USB_HIDINPUT_POWERBOOK is the thing to be used.
The patch fixes this.
Cc: Greg KH <greg@kroah.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/i386/defconfig | 2 | ||||
| -rw-r--r-- | arch/sparc64/defconfig | 2 | ||||
| -rw-r--r-- | arch/x86_64/defconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/input/Kconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index e075ff05c46d..88b7c1cf65a2 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
| @@ -1167,7 +1167,7 @@ CONFIG_USB_STORAGE=y | |||
| 1167 | # USB Input Devices | 1167 | # USB Input Devices |
| 1168 | # | 1168 | # |
| 1169 | CONFIG_USB_HID=y | 1169 | CONFIG_USB_HID=y |
| 1170 | # CONFIG_USB_HID_POWERBOOK is not set | 1170 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1171 | # CONFIG_HID_FF is not set | 1171 | # CONFIG_HID_FF is not set |
| 1172 | # CONFIG_USB_HIDDEV is not set | 1172 | # CONFIG_USB_HIDDEV is not set |
| 1173 | # CONFIG_USB_AIPTEK is not set | 1173 | # CONFIG_USB_AIPTEK is not set |
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 0f0d38f6197c..bda1436aced1 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
| @@ -1103,7 +1103,7 @@ CONFIG_USB_UHCI_HCD=m | |||
| 1103 | # USB Input Devices | 1103 | # USB Input Devices |
| 1104 | # | 1104 | # |
| 1105 | CONFIG_USB_HID=y | 1105 | CONFIG_USB_HID=y |
| 1106 | # CONFIG_USB_HID_POWERBOOK is not set | 1106 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1107 | # CONFIG_HID_FF is not set | 1107 | # CONFIG_HID_FF is not set |
| 1108 | CONFIG_USB_HIDDEV=y | 1108 | CONFIG_USB_HIDDEV=y |
| 1109 | # CONFIG_USB_AIPTEK is not set | 1109 | # CONFIG_USB_AIPTEK is not set |
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index ac80b1209fc0..9cc7c21547a2 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
| @@ -1191,7 +1191,7 @@ CONFIG_USB_STORAGE=y | |||
| 1191 | # USB Input Devices | 1191 | # USB Input Devices |
| 1192 | # | 1192 | # |
| 1193 | CONFIG_USB_HID=y | 1193 | CONFIG_USB_HID=y |
| 1194 | # CONFIG_USB_HID_POWERBOOK is not set | 1194 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set |
| 1195 | # CONFIG_HID_FF is not set | 1195 | # CONFIG_HID_FF is not set |
| 1196 | # CONFIG_USB_HIDDEV is not set | 1196 | # CONFIG_USB_HIDDEV is not set |
| 1197 | # CONFIG_USB_AIPTEK is not set | 1197 | # CONFIG_USB_AIPTEK is not set |
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index e308f6dc2b87..f877cd4f317a 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig | |||
| @@ -29,7 +29,7 @@ config USB_HID | |||
| 29 | comment "Input core support is needed for USB HID input layer or HIDBP support" | 29 | comment "Input core support is needed for USB HID input layer or HIDBP support" |
| 30 | depends on USB_HID && INPUT=n | 30 | depends on USB_HID && INPUT=n |
| 31 | 31 | ||
| 32 | config USB_HID_POWERBOOK | 32 | config USB_HIDINPUT_POWERBOOK |
| 33 | bool "Enable support for iBook/PowerBook special keys" | 33 | bool "Enable support for iBook/PowerBook special keys" |
| 34 | default n | 34 | default n |
| 35 | depends on USB_HID | 35 | depends on USB_HID |