From: Soeren Sonnenburg 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 Cc: Dmitry Torokhov Cc: Benjamin Herrenschmidt Cc: Jiri Kosina Cc: Marcel Holtmann Signed-off-by: Andrew Morton --- arch/i386/defconfig | 2 +- arch/sparc64/defconfig | 2 +- arch/x86_64/defconfig | 2 +- drivers/usb/input/Kconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/i386/defconfig~make-fn_keys-work-again-on-power-macbooks arch/i386/defconfig --- a/arch/i386/defconfig~make-fn_keys-work-again-on-power-macbooks +++ a/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 -puN arch/sparc64/defconfig~make-fn_keys-work-again-on-power-macbooks arch/sparc64/defconfig --- a/arch/sparc64/defconfig~make-fn_keys-work-again-on-power-macbooks +++ a/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 -puN arch/x86_64/defconfig~make-fn_keys-work-again-on-power-macbooks arch/x86_64/defconfig --- a/arch/x86_64/defconfig~make-fn_keys-work-again-on-power-macbooks +++ a/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 -puN drivers/usb/input/Kconfig~make-fn_keys-work-again-on-power-macbooks drivers/usb/input/Kconfig --- a/drivers/usb/input/Kconfig~make-fn_keys-work-again-on-power-macbooks +++ a/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 _