[kernel] r10092 - in dists/trunk/linux-2.6/debian/config: . amd64

[Maximilian Attems]

Author: maks
Date: Thu Jan 10 23:59:47 2008
New Revision: 10092

Log:
mv JOYSTICK_XPAD options to topconfig


Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Thu Jan 10 23:59:47 2008
@@ -1286,7 +1286,6 @@
 CONFIG_HIBERNATION_SMP_POSSIBLE=y
 CONFIG_HAS_DMA=y
 CONFIG_BASE_SMALL=0
-CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_GENERIC_TIME=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
@@ -1310,7 +1309,6 @@
 # CONFIG_IDEPCI_PCIBUS_ORDER is not set
 CONFIG_ASYNC_CORE=m
 CONFIG_MMU=y
-CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_PHYSICAL_ALIGN=0x200000
 CONFIG_VIRT_TO_BUS=y

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Thu Jan 10 23:59:47 2008
@@ -1041,6 +1041,8 @@
 CONFIG_KEYBOARD_STOWAWAY=m
 CONFIG_MOUSE_PS2_ALPS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
 CONFIG_TOUCHSCREEN_ADS7846=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m