From db94e0924842996580367dd9209dcfc3b2829904 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 23 May 2007 10:41:00 +0000 Subject: [PATCH] deal with the move ove the usb tablets under drivers/input: * enable CONFIG_INPUT_TABLET where wacom was enabled * explicitly enable all where wacom was enabled * remove the old config entrys as CONFIG_INPUT_TABLET defaults to n anyway svn path=/dists/trunk/linux-2.6/; revision=8724 --- debian/arch/alpha/config | 9 ++++++--- debian/arch/amd64/config | 9 ++++++--- debian/arch/arm/config.footbridge | 4 ---- debian/arch/arm/config.iop32x | 10 ++++++---- debian/arch/arm/config.ixp4xx | 10 ++++++---- debian/arch/config | 1 - debian/arch/hppa/config | 4 ---- debian/arch/i386/config | 9 ++++++--- debian/arch/ia64/config | 9 ++++++--- debian/arch/mips/config.4kc-malta | 10 ++++++---- debian/arch/mips/config.sb1-bcm91250a | 4 ---- debian/arch/mips/config.sb1a-bcm91480b | 4 ---- debian/arch/mipsel/config.4kc-malta | 10 ++++++---- debian/arch/mipsel/config.r5k-cobalt | 4 ---- debian/arch/mipsel/config.sb1-bcm91250a | 4 ---- debian/arch/mipsel/config.sb1a-bcm91480b | 4 ---- debian/arch/powerpc/config | 9 ++++++--- debian/arch/sparc/config.sparc64 | 2 -- debian/arch/sparc/config.sparc64-smp | 2 -- debian/changelog | 3 ++- 20 files changed, 56 insertions(+), 65 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index d743434d8..9e2bbff1a 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -803,6 +803,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -1306,9 +1312,6 @@ CONFIG_USB_HIDINPUT=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index a068e31ac..0344e439e 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -720,6 +720,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -1161,9 +1167,6 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 3830d60bc..4fc707142 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -1336,10 +1336,6 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -CONFIG_USB_ACECAD=m -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set CONFIG_USB_YEALINK=m # CONFIG_USB_XPAD is not set diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 93ad68188..f1bf74eb6 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -965,6 +965,12 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -1557,10 +1563,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m # CONFIG_USB_YEALINK is not set CONFIG_USB_XPAD=m diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 6d0f83ca8..80a580a7e 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -938,6 +938,12 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_IXP4XX_BEEPER=m @@ -1563,10 +1569,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_YEALINK=m CONFIG_USB_XPAD=m diff --git a/debian/arch/config b/debian/arch/config index 03b0b1d82..73bd45ff6 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -234,7 +234,6 @@ CONFIG_FB_ARC=m CONFIG_FUSION_SPI=m CONFIG_DVB_USB_CXUSB=m CONFIG_FUSION_FC=m -CONFIG_USB_ACECAD=m CONFIG_NFSD_V2_ACL=y CONFIG_I2O_EXT_ADAPTEC=y CONFIG_USB_CXACRU=m diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 58350eb8c..e4b467a10 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -650,10 +650,6 @@ CONFIG_USB_HIDINPUT=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set # CONFIG_USB_XPAD is not set # CONFIG_USB_ATI_REMOTE is not set # CONFIG_USB_MDC800 is not set diff --git a/debian/arch/i386/config b/debian/arch/i386/config index d91473fde..af1a09ab2 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -891,6 +891,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -1411,9 +1417,6 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index 9b1aab5f7..39aa5f796 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -586,6 +586,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m @@ -1007,9 +1013,6 @@ CONFIG_HID_FF=y CONFIG_USB_HIDDEV=y CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m diff --git a/debian/arch/mips/config.4kc-malta b/debian/arch/mips/config.4kc-malta index dab1a9a9e..9c26b4591 100644 --- a/debian/arch/mips/config.4kc-malta +++ b/debian/arch/mips/config.4kc-malta @@ -1747,6 +1747,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2534,10 +2540,6 @@ CONFIG_USB_HIDDEV=y # CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_YEALINK=m CONFIG_USB_XPAD=m diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index cb0fae98f..bf2287a0a 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -1382,10 +1382,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 523fd58a4..6c3757f83 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -1378,10 +1378,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/arch/mipsel/config.4kc-malta index c61e6fb14..706eaef74 100644 --- a/debian/arch/mipsel/config.4kc-malta +++ b/debian/arch/mipsel/config.4kc-malta @@ -1748,6 +1748,12 @@ CONFIG_JOYSTICK_DB9=m CONFIG_JOYSTICK_GAMECON=m CONFIG_JOYSTICK_TURBOGRAFX=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m CONFIG_TOUCHSCREEN_GUNZE=m @@ -2534,10 +2540,6 @@ CONFIG_USB_HIDDEV=y # CONFIG_USB_KBD=m CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_ACECAD=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_YEALINK=m CONFIG_USB_XPAD=m diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index 4505267e1..3d1774e01 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -1219,10 +1219,6 @@ CONFIG_USB_STORAGE_ALAUDA=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 3ac1af066..69696e587 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -1382,10 +1382,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index 976915b10..7456525f1 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -1378,10 +1378,6 @@ CONFIG_USB_HIDDEV=y # # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_ACECAD is not set -# CONFIG_USB_KBTAB is not set # CONFIG_USB_POWERMATE is not set # CONFIG_USB_YEALINK is not set # CONFIG_USB_XPAD is not set diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 0010f758e..f78e88eb1 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -587,6 +587,12 @@ CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_STINGER=m CONFIG_JOYSTICK_TWIDJOY=m CONFIG_JOYSTICK_JOYDUMP=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=m +CONFIG_TABLET_USB_GTCO=m +CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -982,9 +988,6 @@ CONFIG_THRUSTMASTER_FF=y CONFIG_USB_HIDDEV=y # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index 48ed34e02..86608bc38 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -184,7 +184,6 @@ CONFIG_BLK_DEV_SIIMAGE=m # CONFIG_VIDEO_CX88 is not set # CONFIG_SENSORS_FSCPOS is not set CONFIG_SND_CMIPCI=m -# CONFIG_USB_AIPTEK is not set CONFIG_LARGE_ALLOCS=y CONFIG_FB_ATY=y CONFIG_SK98LIN=m @@ -313,7 +312,6 @@ CONFIG_NE2K_PCI=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_8139_OLD_RX_RESET is not set # CONFIG_I2C_ALI15X3 is not set -# CONFIG_USB_WACOM is not set CONFIG_SUNDANCE_MMIO=y CONFIG_SCSI_FCAL=m # CONFIG_BLK_DEV_TRIFLEX is not set diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 8b3a14e1c..e2124bd66 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -184,7 +184,6 @@ CONFIG_BLK_DEV_SIIMAGE=m # CONFIG_VIDEO_CX88 is not set # CONFIG_SENSORS_FSCPOS is not set CONFIG_SND_CMIPCI=m -# CONFIG_USB_AIPTEK is not set CONFIG_LARGE_ALLOCS=y CONFIG_FB_ATY=y CONFIG_SK98LIN=m @@ -315,7 +314,6 @@ CONFIG_NE2K_PCI=m # CONFIG_USB_EHCI_ROOT_HUB_TT is not set # CONFIG_8139_OLD_RX_RESET is not set # CONFIG_I2C_ALI15X3 is not set -# CONFIG_USB_WACOM is not set CONFIG_SUNDANCE_MMIO=y CONFIG_SCSI_FCAL=m # CONFIG_BLK_DEV_TRIFLEX is not set diff --git a/debian/changelog b/debian/changelog index 484efca96..07b8a890b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,11 +18,12 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low * Enable the newly added crypto algorythm: fcrypt, pcbc and camellia. * Unify CONFIG_TR to toplevel config, also enable new drivers 3C359 and SMCTR. + * Enable the moved USB tablets config options where wacom is enabled. [ Martin Michlmayr ] * mipsel/r5k-cobalt: Use the new RTC system. - -- maximilian attems Tue, 22 May 2007 17:22:01 +0200 + -- maximilian attems Wed, 23 May 2007 12:38:57 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low