SOURCES: kernel-vanilla-multiarch.conf - remove duplicate symbols ...

[patrys]

Author: patrys                       Date: Fri Mar 14 12:39:40 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- remove duplicate symbols
- build *80211 inside the kernel, they ooops as modules
- enable ACPI_VIDEO

---- Files affected:
SOURCES:
   kernel-vanilla-multiarch.conf (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-multiarch.conf
diff -u SOURCES/kernel-vanilla-multiarch.conf:1.62 SOURCES/kernel-vanilla-multiarch.conf:1.63
--- SOURCES/kernel-vanilla-multiarch.conf:1.62	Sun Mar  2 17:37:36 2008
+++ SOURCES/kernel-vanilla-multiarch.conf	Fri Mar 14 13:39:35 2008
@@ -891,9 +891,6 @@
 NET_CLS_POLICE all=y
 NET_CLS_IND all=y
 NET_SCH_FIFO all=y
-NET_SCH_RR all=m
-NET_ACT_NAT all=m
-NET_CLS_POLICE all=y
 
 #
 # Network testing
@@ -1025,10 +1022,10 @@
 #
 # Wireless
 #
-CFG80211 all=m
+CFG80211 all=y
 NL80211 all=y
 WIRELESS_EXT all=y
-MAC80211 all=m
+MAC80211 all=y
 MAC80211_RCSIMPLE all=y
 MAC80211_LEDS all=y
 MAC80211_DEBUGFS all=n
@@ -4164,7 +4161,7 @@
 VMSPLIT_3G_OPT i386=
 VMSPLIT_2G i386=
 VMSPLIT_1G i386=
-ACPI_VIDEO i386= x86_64=
+ACPI_VIDEO i386=m x86_64=m
 ACPI_HOTPLUG_MEMORY x86_64=
 DEBUG_PAGEALLOC i386= ppc=n
 MEMORY_HOTPLUG x86_64=
@@ -4431,4 +4428,3 @@
 SPARC_LED sparc=m
 SUN_PM sparc=y
 TADPOLE_TS102_UCTRL sparc=m
-EDAC all=y
================================================================

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