diff --git a/ChangeLog b/ChangeLog index 20eca7c..c019af4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 13 Jun 2011; Sebastian Pipping arch/x86/kernel-config, + arch/x86_64/kernel-config, defaults/kernel-config: + Apply CONFIG_USB_HID=y to archs amd64/x86/default (bug #270983) + 13 Jun 2011; Sebastian Pipping arch/x86/kernel-config, arch/x86_64/kernel-config, defaults/kernel-config: Unset CONFIG_IDE on archs amd64/x86/default (bug #357213) diff --git a/arch/x86/kernel-config b/arch/x86/kernel-config index ab38c09..259defc 100644 --- a/arch/x86/kernel-config +++ b/arch/x86/kernel-config @@ -2877,7 +2877,7 @@ CONFIG_HIDRAW=y # # USB Input Devices # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_HID_FF=y CONFIG_HID_PID=y diff --git a/arch/x86_64/kernel-config b/arch/x86_64/kernel-config index ef43dc1..5a0f58e 100644 --- a/arch/x86_64/kernel-config +++ b/arch/x86_64/kernel-config @@ -2546,7 +2546,7 @@ CONFIG_HIDRAW=y # # USB Input Devices # -CONFIG_USB_HID=m +CONFIG_USB_HID=y # CONFIG_HID_PID is not set CONFIG_USB_HIDDEV=y diff --git a/defaults/kernel-config b/defaults/kernel-config index 9ea854b..b4f2899 100644 --- a/defaults/kernel-config +++ b/defaults/kernel-config @@ -2877,7 +2877,7 @@ CONFIG_HIDRAW=y # # USB Input Devices # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_HID_FF=y CONFIG_HID_PID=y