diff options
| author | Soeren Sonnenburg <kernel@nn7.de> | 2006-12-30 03:47:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 21:55:55 +0300 |
| commit | 10f549fa1538849548787879d96bbb3450f06117 (patch) | |
| tree | 4b26230ba720f735f159017ef80ff82caaa12583 | |
| parent | d8a82d7b0a22495023e90856e58639412a5ee3f7 (diff) | |
| download | linux-10f549fa1538849548787879d96bbb3450f06117.tar.xz | |
[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 # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HID_POWERBOOK is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set # 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 # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HID_POWERBOOK is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set CONFIG_USB_HIDDEV=y # 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 # USB Input Devices # CONFIG_USB_HID=y -# CONFIG_USB_HID_POWERBOOK is not set +# CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set # 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 comment "Input core support is needed for USB HID input layer or HIDBP support" depends on USB_HID && INPUT=n -config USB_HID_POWERBOOK +config USB_HIDINPUT_POWERBOOK bool "Enable support for iBook/PowerBook special keys" default n depends on USB_HID |