rpms/kernel/devel config-generic,1.1,1.2

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32724

Modified Files:
	config-generic 
Log Message:
Un-remove davej's config-generic changes from this morning. Oops.


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config-generic	12 Jul 2007 19:15:37 -0000	1.1
+++ config-generic	12 Jul 2007 19:39:19 -0000	1.2
@@ -93,6 +93,7 @@
 
 CONFIG_PCCARD=y
 CONFIG_MMC=m
+CONFIG_MMC_BLOCK_BOUNCE=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MMC_BLOCK=m
@@ -274,6 +275,7 @@
 #
 # Block devices
 #
+CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_FD=m
 # CONFIG_BLK_DEV_XD is not set
 CONFIG_PARIDE=m
@@ -1125,6 +1127,7 @@
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
 
 #
 # Ethernet (10000 Mbit)
@@ -1557,6 +1560,7 @@
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_TWIDJOY=m
 CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
@@ -3163,3 +3167,11 @@
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_CPU_IDLE_GOV_MENU=y
 
+CONFIG_POWER_SUPPLY=m
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_APM_POWER=m
+# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_PMU=m
+# CONFIG_PDA_POWER is not set
+
+