SOURCES: kernel-vanilla-multiarch.conf - make it build with 2.6.26 (tested ...

[patrys]

Author: patrys                       Date: Wed Jul 23 22:37:03 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make it build with 2.6.26 (tested with and without PAE)

---- Files affected:
SOURCES:
   kernel-vanilla-multiarch.conf (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-multiarch.conf
diff -u SOURCES/kernel-vanilla-multiarch.conf:1.80 SOURCES/kernel-vanilla-multiarch.conf:1.81
--- SOURCES/kernel-vanilla-multiarch.conf:1.80	Mon Jul 14 14:10:37 2008
+++ SOURCES/kernel-vanilla-multiarch.conf	Thu Jul 24 00:36:57 2008
@@ -425,6 +425,7 @@
 PCI_GOBIOS i386=n
 PCI_GOMMCONFIG i386=n
 PCI_GODIRECT i386=n
+PCI_GOOLPC i386=n
 PCI_GOANY i386=y
 PCI_BIOS i386=y
 PCI_DIRECT i386=y x86_64=y
@@ -450,6 +451,7 @@
 MCA i386=n
 SCx200 i386=m
 SCx200HR_TIMER i386=m
+OLPC all=y
 K8_NB x86_64=y i386=y
 PCCARD all=m sparc=
 PCMCIA_DEBUG all=n sparc=
@@ -1445,6 +1447,7 @@
 MEGARAID_SAS all=m sparc=
 SCSI_HPTIOP all=m sparc=
 SCSI_BUSLOGIC all=m sparc=
+SCSI_FLASHPOINT all=y
 SCSI_OMIT_FLASHPOINT all=n sparc= x86_64=
 SCSI_DMX3191D all=m sparc=
 SCSI_DTC3280 all=m x86_64= sparc=
@@ -1871,8 +1874,8 @@
 P54_USB all=m sparc=
 P54_PCI all=m sparc=
 IWLWIFI all=y sparc= i386= x86_64=m ppc=
-IWLWIFI_DEBUG all=n sparc= i386= x86_64=n ppc=
-IWLWIFI_SENSITIVITY all=y sparc= i386= x86_64= ppc=
+IWLWIFI_SENSITIVITY all=y sparc= x86_64= ppc=
+IWLWIFI_DEBUG all=n sparc= x86_64=n ppc=
 IWLWIFI_SPECTRUM_MEASUREMENT all=y sparc= i386= x86_64= ppc=
 IWLWIFI_QOS all=y sparc= i386= x86_64= ppc=
 IWL4965 all=m sparc=
@@ -1975,12 +1978,12 @@
 HDLC_RAW_ETH ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=m
 HDLC_CISCO ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=m
 HDLC_FR ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=m
-HDLC_PPP ppc= x86_64=m sparc64=m i386= alpha=m sparc=m
+HDLC_PPP ppc= x86_64=m sparc64=m i386=m alpha=m sparc=m
 HDLC_X25 ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=m
 PCI200SYN all=m sparc=
 WANXL all=m sparc=
 PC300 all=m sparc=
-PC300_MLPPP all=y sparc= i386= x86_64=n ppc=
+PC300_MLPPP all=y sparc= x86_64=n ppc=
 
 #
 # Cyclades-PC300 MLPPP support is disabled.
@@ -2101,6 +2104,8 @@
 ISDN_DRV_PCBIT all=m x86_64= ppc= sparc=
 ISDN_DRV_SC all=m x86_64= sparc=
 ISDN_DRV_ACT2000 all=m x86_64= sparc=
+HYSDN all=m sparc=
+HYSDN_CAPI all=y sparc=
 ISDN_DRV_GIGASET all=m sparc=
 GIGASET_BASE all=m sparc=
 GIGASET_M105 all=m sparc=
@@ -2476,6 +2481,7 @@
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
 BATTERY_DS2760 all=m
+BATTERY_OLPC all=m
 HWMON all=m
 HWMON_VID all=m
 SENSORS_ABITUGURU all=m ppc= sparc=
@@ -3094,6 +3100,7 @@
 #
 # Generic devices
 #
+SND_PCSP all=m
 SND_MPU401_UART all=m
 SND_OPL3_LIB all=m sparc=
 SND_OPL4_LIB all=m x86_64= sparc=
@@ -3373,7 +3380,7 @@
 USB_STORAGE_SDDR55 all=y sparc=
 USB_STORAGE_JUMPSHOT all=y sparc=
 USB_STORAGE_ALAUDA all=y sparc=
-USB_STORAGE_ONETOUCH alpha=y x86_64=n
+USB_STORAGE_ONETOUCH all=y sparc=
 USB_STORAGE_KARMA all=y sparc=
 USB_LIBUSUAL all=y sparc=
 
@@ -4125,8 +4132,6 @@
 MV643XX_ETH all=m x86_64= i386= sparc=
 APPLE_AIRPORT all=m x86_64= i386= sparc=
 ISDN_DRV_LOOP all=m x86_64= ppc= i386= sparc=
-HYSDN all=m x86_64=m ppc= i386= sparc=
-HYSDN_CAPI all=y x86_64=n ppc= i386= sparc=
 RISCOM8 all=m x86_64=m ppc=m i386=m sparc=
 STALLION all=m x86_64= ppc= i386= sparc=
 ISTALLION all=m x86_64= ppc= i386= sparc=
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vanilla-multiarch.conf?r1=1.80&r2=1.81&f=u