[kernel] r11374 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 mips mipsel powerpc

Maximilian Attems maks at alioth.debian.org
Mon May 12 11:22:22 UTC 2008 

Author: maks
Date: Mon May 12 11:22:21 2008
New Revision: 11374

Log:
topconfig unset PRISM54

nuke any duplicate definition, P54 is wanted these days.


Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge
   dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/arm/config.versatile
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/hppa/config
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Mon May 12 11:22:21 2008
@@ -983,7 +983,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

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	Mon May 12 11:22:21 2008
@@ -1067,7 +1067,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Mon May 12 11:22:21 2008
@@ -807,7 +807,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 # CONFIG_USB_ZD1201 is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx	Mon May 12 11:22:21 2008
@@ -559,7 +559,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 # CONFIG_PCI_ATMEL is not set
-# CONFIG_PRISM54 is not set
 
 ##
 ## file: drivers/net/wireless/hostap/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile	Mon May 12 11:22:21 2008
@@ -770,7 +770,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 # CONFIG_PCI_ATMEL is not set
-# CONFIG_PRISM54 is not set
 # CONFIG_USB_ZD1201 is not set
 CONFIG_RTL8187=m
 # CONFIG_ADM8211 is not set

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	Mon May 12 11:22:21 2008
@@ -1148,6 +1148,7 @@
 CONFIG_AIRO=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_PRISM54 is not set
 CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_RTL8180=m
 CONFIG_RTL8187=m

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Mon May 12 11:22:21 2008
@@ -406,7 +406,6 @@
 # CONFIG_ATMEL is not set
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 # CONFIG_USB_ZD1201 is not set
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Mon May 12 11:22:21 2008
@@ -1277,7 +1277,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Mon May 12 11:22:21 2008
@@ -649,7 +649,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Mon May 12 11:22:21 2008
@@ -1255,7 +1255,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Mon May 12 11:22:21 2008
@@ -1499,7 +1499,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Mon May 12 11:22:21 2008
@@ -1254,7 +1254,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Mon May 12 11:22:21 2008
@@ -1498,7 +1498,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Mon May 12 11:22:21 2008
@@ -644,7 +644,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-# CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 
 ##

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Mon May 12 11:22:21 2008
@@ -735,7 +735,6 @@
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 
 ##

More information about the Kernel-svn-changes mailing list