提交 10f549fa 编写于 作者: S Soeren Sonnenburg 提交者: Linus Torvalds

[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: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 d8a82d7b
...@@ -1167,7 +1167,7 @@ CONFIG_USB_STORAGE=y ...@@ -1167,7 +1167,7 @@ CONFIG_USB_STORAGE=y
# USB Input Devices # USB Input Devices
# #
CONFIG_USB_HID=y 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_HID_FF is not set
# CONFIG_USB_HIDDEV is not set # CONFIG_USB_HIDDEV is not set
# CONFIG_USB_AIPTEK is not set # CONFIG_USB_AIPTEK is not set
......
...@@ -1103,7 +1103,7 @@ CONFIG_USB_UHCI_HCD=m ...@@ -1103,7 +1103,7 @@ CONFIG_USB_UHCI_HCD=m
# USB Input Devices # USB Input Devices
# #
CONFIG_USB_HID=y 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_HID_FF is not set
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
# CONFIG_USB_AIPTEK is not set # CONFIG_USB_AIPTEK is not set
......
...@@ -1191,7 +1191,7 @@ CONFIG_USB_STORAGE=y ...@@ -1191,7 +1191,7 @@ CONFIG_USB_STORAGE=y
# USB Input Devices # USB Input Devices
# #
CONFIG_USB_HID=y 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_HID_FF is not set
# CONFIG_USB_HIDDEV is not set # CONFIG_USB_HIDDEV is not set
# CONFIG_USB_AIPTEK is not set # CONFIG_USB_AIPTEK is not set
......
...@@ -29,7 +29,7 @@ config USB_HID ...@@ -29,7 +29,7 @@ config USB_HID
comment "Input core support is needed for USB HID input layer or HIDBP support" comment "Input core support is needed for USB HID input layer or HIDBP support"
depends on USB_HID && INPUT=n depends on USB_HID && INPUT=n
config USB_HID_POWERBOOK config USB_HIDINPUT_POWERBOOK
bool "Enable support for iBook/PowerBook special keys" bool "Enable support for iBook/PowerBook special keys"
default n default n
depends on USB_HID depends on USB_HID
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册