SOURCES (LINUX_2_6): kernel-ppc-smp.config - sync with kernel-ppc....

[paszczus]

Author: paszczus                     Date: Sun Sep  3 16:20:20 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- sync with kernel-ppc.config, should now works

---- Files affected:
SOURCES:
   kernel-ppc-smp.config (1.6.4.1.2.195 -> 1.6.4.1.2.196) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ppc-smp.config
diff -u SOURCES/kernel-ppc-smp.config:1.6.4.1.2.195 SOURCES/kernel-ppc-smp.config:1.6.4.1.2.196
--- SOURCES/kernel-ppc-smp.config:1.6.4.1.2.195	Sun Sep  3 17:20:31 2006
+++ SOURCES/kernel-ppc-smp.config	Sun Sep  3 18:20:15 2006
@@ -4,6 +4,7 @@
 # Fri Apr 28 19:28:12 2006
 #
 # CONFIG_PPC64 is not set
+# CONFIG_PPC_85xx is not set
 CONFIG_PPC32=y
 CONFIG_PPC_MERGE=y
 CONFIG_MMU=y
@@ -1387,6 +1388,8 @@
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
 CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
+# CONFIG_BCM43XX_DMA_MODE is not set
+# CONFIG_BCM43XX_PIO_MODE is not set
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support
@@ -1557,7 +1560,7 @@
 CONFIG_GIGASET_BASE=m
 CONFIG_GIGASET_M105=m
 CONFIG_GIGASET_DEBUG=n
-CONFIG_GIGASET_UNDOCREQ=np
+CONFIG_GIGASET_UNDOCREQ=n
 
 #
 # ISDN4Linux hardware drivers
@@ -1574,6 +1577,8 @@
 CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_SC=m
 CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
 
 #
 # CAPI subsystem
@@ -1707,6 +1712,8 @@
 CONFIG_GAMEPORT_L4=m
 CONFIG_GAMEPORT_EMU10K1=m
 CONFIG_GAMEPORT_FM801=m
+CONFIG_MIDI_EMU10K1=y
+CONFIG_MIDI_VIA82CXXX=y
 
 #
 # Character devices
@@ -1731,6 +1738,8 @@
 CONFIG_SPECIALIX=m
 # CONFIG_SPECIALIX_RTSCTS is not set
 CONFIG_SX=m
+CONFIG_RIO=m
+CONFIG_RIO_OLDPCI=y
 CONFIG_STALDRV=y
 
 #
@@ -2010,6 +2019,7 @@
 CONFIG_VIDEO_CX25840=m
 CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_UPD64085=m
 
 #
@@ -2482,7 +2492,7 @@
 CONFIG_AEDSP16_MPU401=y
 CONFIG_SOUND_TVMIXER=m
 CONFIG_SOUND_KAHLUA=m
-CONFIG_SOUND_VIA82CXXX=n
+CONFIG_SOUND_VIA82CXXX=m
 
 #
 # USB support
@@ -2564,7 +2574,7 @@
 CONFIG_USB_ACECAD=m
 CONFIG_USB_KBTAB=m
 CONFIG_USB_POWERMATE=m
-CONFIG_USB_TOCHSCREEN=m
+CONFIG_USB_TOUCHSCREEN=m
 CONFIG_USB_MTOUCH=m
 CONFIG_USB_ITMTOUCH=m
 CONFIG_USB_EGALAX=m
@@ -2697,6 +2707,11 @@
 CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_LD=m
 CONFIG_USB_TEST=m
+
+#
+# LED devices
+#
+CONFIG_NEW_LEDS=n
 
 #
 # USB DSL modem support
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-ppc-smp.config?r1=1.6.4.1.2.195&r2=1.6.4.1.2.196&f=u