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
This commit is contained in:
Maximilian Attems 2007-05-23 10:41:00 +00:00
parent 00c276bfb0
commit db94e09248
20 changed files with 56 additions and 65 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

1
debian/arch/config vendored
View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

3
debian/changelog vendored
View File

@ -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 <maks@debian.org> Tue, 22 May 2007 17:22:01 +0200
-- maximilian attems <maks@debian.org> Wed, 23 May 2007 12:38:57 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low