[kernel] r8724 - in dists/trunk/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/mips arch/mipsel arch/powerpc arch/sparc
Maximilian Attems
maks at alioth.debian.org
Wed May 23 10:41:00 UTC 2007
Author: maks
Date: Wed May 23 10:41:00 2007
New Revision: 8724
Log:
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
Modified:
dists/trunk/linux-2.6/debian/arch/alpha/config
dists/trunk/linux-2.6/debian/arch/amd64/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/arch/config
dists/trunk/linux-2.6/debian/arch/hppa/config
dists/trunk/linux-2.6/debian/arch/i386/config
dists/trunk/linux-2.6/debian/arch/ia64/config
dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/arch/powerpc/config
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
dists/trunk/linux-2.6/debian/changelog
Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config Wed May 23 10:41:00 2007
@@ -803,6 +803,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config Wed May 23 10:41:00 2007
@@ -720,6 +720,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Wed May 23 10:41:00 2007
@@ -1336,10 +1336,6 @@
#
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
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x Wed May 23 10:41:00 2007
@@ -965,6 +965,12 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx Wed May 23 10:41:00 2007
@@ -938,6 +938,12 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config (original)
+++ dists/trunk/linux-2.6/debian/arch/config Wed May 23 10:41:00 2007
@@ -234,7 +234,6 @@
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
Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config Wed May 23 10:41:00 2007
@@ -650,10 +650,6 @@
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
Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config Wed May 23 10:41:00 2007
@@ -891,6 +891,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config Wed May 23 10:41:00 2007
@@ -586,6 +586,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.4kc-malta Wed May 23 10:41:00 2007
@@ -1747,6 +1747,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a Wed May 23 10:41:00 2007
@@ -1382,10 +1382,6 @@
#
# 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
Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b Wed May 23 10:41:00 2007
@@ -1378,10 +1378,6 @@
#
# 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
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.4kc-malta Wed May 23 10:41:00 2007
@@ -1748,6 +1748,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt Wed May 23 10:41:00 2007
@@ -1219,10 +1219,6 @@
#
# 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
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a Wed May 23 10:41:00 2007
@@ -1382,10 +1382,6 @@
#
# 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
Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b Wed May 23 10:41:00 2007
@@ -1378,10 +1378,6 @@
#
# 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
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config Wed May 23 10:41:00 2007
@@ -587,6 +587,12 @@
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_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
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 Wed May 23 10:41:00 2007
@@ -184,7 +184,6 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp Wed May 23 10:41:00 2007
@@ -184,7 +184,6 @@
# 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_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
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed May 23 10:41:00 2007
@@ -18,11 +18,12 @@
* 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 at debian.org> Tue, 22 May 2007 17:22:01 +0200
+ -- maximilian attems <maks at debian.org> Wed, 23 May 2007 12:38:57 +0200
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
More information about the Kernel-svn-changes
mailing list