From d37d59f5f94b63826f6b68a649e3e2884623d96d Mon Sep 17 00:00:00 2001 From: Soeren Sonnenburg Date: Fri, 29 Dec 2006 16:47:46 -0800 Subject: [PATCH] --- yaml --- r: 45109 b: refs/heads/master c: 10f549fa1538849548787879d96bbb3450f06117 h: refs/heads/master i: 45107: f49344da7a1274c5025ad77b1ad6e20498ca384a v: v3 --- [refs] | 2 +- trunk/arch/i386/defconfig | 2 +- trunk/arch/sparc64/defconfig | 2 +- trunk/arch/x86_64/defconfig | 2 +- trunk/drivers/usb/input/Kconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a0def243c181..cfaae76b7d19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8a82d7b0a22495023e90856e58639412a5ee3f7 +refs/heads/master: 10f549fa1538849548787879d96bbb3450f06117 diff --git a/trunk/arch/i386/defconfig b/trunk/arch/i386/defconfig index e075ff05c46d..88b7c1cf65a2 100644 --- a/trunk/arch/i386/defconfig +++ b/trunk/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/trunk/arch/sparc64/defconfig b/trunk/arch/sparc64/defconfig index 0f0d38f6197c..bda1436aced1 100644 --- a/trunk/arch/sparc64/defconfig +++ b/trunk/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/trunk/arch/x86_64/defconfig b/trunk/arch/x86_64/defconfig index ac80b1209fc0..9cc7c21547a2 100644 --- a/trunk/arch/x86_64/defconfig +++ b/trunk/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/trunk/drivers/usb/input/Kconfig b/trunk/drivers/usb/input/Kconfig index e308f6dc2b87..f877cd4f317a 100644 --- a/trunk/drivers/usb/input/Kconfig +++ b/trunk/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