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

Maximilian Attems maks at alioth.debian.org
Tue Jan 29 21:46:46 UTC 2008 

Author: maks
Date: Tue Jan 29 21:46:46 2008
New Revision: 10273

Log:
topconfig disable PRISM54

nuke dup definitions, p54 is topenabled too.


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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jan 29 21:46:46 2008
@@ -1,10 +1,14 @@
 linux-2.6 (2.6.24-2) UNRELEASED; urgency=low
 
+  [ Bastian Blank ]
   * Fix broken merge of flavour specific settings.
     - [i386]: Recommends are fixed.
     - [s390/s390-tape]: Built as small image again.
 
- -- Bastian Blank <waldi at debian.org>  Mon, 28 Jan 2008 17:48:04 +0100
+  [ maximilian attems ]
+  * Disable old dup prism54 driver.
+
+ -- maximilian attems <maks at debian.org>  Tue, 29 Jan 2008 22:45:10 +0100
 
 linux-2.6 (2.6.24-1) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/alpha/config	(original)
+++ dists/sid/linux-2.6/debian/config/alpha/config	Tue Jan 29 21:46:46 2008
@@ -511,7 +511,6 @@
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m

Modified: dists/sid/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/config	(original)
+++ dists/sid/linux-2.6/debian/config/amd64/config	Tue Jan 29 21:46:46 2008
@@ -479,7 +479,6 @@
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m

Modified: dists/sid/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.footbridge	Tue Jan 29 21:46:46 2008
@@ -1557,7 +1557,6 @@
 CONFIG_USB_SPEEDTOUCH=m
 # CONFIG_ATM_CLIP_NO_ICMP is not set
 CONFIG_PCMCIA_3C574=m
-CONFIG_PRISM54=m
 # CONFIG_BLK_DEV_SLC90E66 is not set
 CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_FB_PM3 is not set

Modified: dists/sid/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.ixp4xx	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.ixp4xx	Tue Jan 29 21:46:46 2008
@@ -737,7 +737,6 @@
 #
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
-# CONFIG_PRISM54 is not set
 CONFIG_HOSTAP=m
 # CONFIG_HOSTAP_FIRMWARE is not set
 CONFIG_HOSTAP_PLX=m

Modified: dists/sid/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/sid/linux-2.6/debian/config/arm/config.versatile	(original)
+++ dists/sid/linux-2.6/debian/config/arm/config.versatile	Tue Jan 29 21:46:46 2008
@@ -1070,7 +1070,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/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	(original)
+++ dists/sid/linux-2.6/debian/config/config	Tue Jan 29 21:46:46 2008
@@ -940,6 +940,7 @@
 CONFIG_AIRO=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCMCIA_SPECTRUM=m
+# CONFIG_PRISM54 is not set
 CONFIG_RTL8187=m
 CONFIG_ADM8211=m
 CONFIG_P54_COMMON=m

Modified: dists/sid/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/hppa/config	(original)
+++ dists/sid/linux-2.6/debian/config/hppa/config	Tue Jan 29 21:46:46 2008
@@ -330,7 +330,6 @@
 CONFIG_PCMCIA_HERMES=m
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m

Modified: dists/sid/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/config	(original)
+++ dists/sid/linux-2.6/debian/config/i386/config	Tue Jan 29 21:46:46 2008
@@ -616,7 +616,6 @@
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m

Modified: dists/sid/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/config/ia64/config	Tue Jan 29 21:46:46 2008
@@ -61,7 +61,6 @@
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 # CONFIG_PCMCIA_3C589 is not set
 CONFIG_PCMCIA_3C574=m

Modified: dists/sid/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.4kc-malta	(original)
+++ dists/sid/linux-2.6/debian/config/mips/config.4kc-malta	Tue Jan 29 21:46:46 2008
@@ -1239,7 +1239,6 @@
 #
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y

Modified: dists/sid/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mips/config.5kc-malta	(original)
+++ dists/sid/linux-2.6/debian/config/mips/config.5kc-malta	Tue Jan 29 21:46:46 2008
@@ -1315,7 +1315,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y

Modified: dists/sid/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mipsel/config.4kc-malta	(original)
+++ dists/sid/linux-2.6/debian/config/mipsel/config.4kc-malta	Tue Jan 29 21:46:46 2008
@@ -1239,7 +1239,6 @@
 #
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y

Modified: dists/sid/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/sid/linux-2.6/debian/config/mipsel/config.5kc-malta	(original)
+++ dists/sid/linux-2.6/debian/config/mipsel/config.5kc-malta	Tue Jan 29 21:46:46 2008
@@ -1315,7 +1315,6 @@
 CONFIG_PCI_HERMES=m
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
-CONFIG_PRISM54=m
 CONFIG_USB_ZD1201=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y

Modified: dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt	(original)
+++ dists/sid/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Tue Jan 29 21:46:46 2008
@@ -574,7 +574,6 @@
 #
 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
 #
-# CONFIG_PRISM54 is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	(original)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Tue Jan 29 21:46:46 2008
@@ -369,7 +369,6 @@
 CONFIG_AIRO_CS=m
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m

More information about the Kernel-svn-changes mailing list