[kernel] r5285 - in people/waldi/linux-2.6: . debian debian/arch
debian/arch/alpha debian/arch/amd64 debian/arch/arm
debian/arch/hppa debian/arch/i386 debian/arch/ia64
debian/arch/m68k debian/arch/powerpc debian/arch/s390
debian/arch/sparc
Bastian Blank
waldi at costa.debian.org
Thu Jan 5 15:59:35 UTC 2006
Author: waldi
Date: Thu Jan 5 15:59:32 2006
New Revision: 5285
Modified:
people/waldi/linux-2.6/ (props changed)
people/waldi/linux-2.6/debian/arch/alpha/config
people/waldi/linux-2.6/debian/arch/amd64/config
people/waldi/linux-2.6/debian/arch/arm/config
people/waldi/linux-2.6/debian/arch/arm/config.footbridge
people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
people/waldi/linux-2.6/debian/arch/config
people/waldi/linux-2.6/debian/arch/hppa/config
people/waldi/linux-2.6/debian/arch/i386/config
people/waldi/linux-2.6/debian/arch/ia64/config
people/waldi/linux-2.6/debian/arch/m68k/config
people/waldi/linux-2.6/debian/arch/powerpc/config
people/waldi/linux-2.6/debian/arch/s390/config
people/waldi/linux-2.6/debian/arch/sparc/config
people/waldi/linux-2.6/debian/changelog
Log:
Merge /dists/trunk/linux-2.6.
Modified: people/waldi/linux-2.6/debian/arch/alpha/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/config (original)
+++ people/waldi/linux-2.6/debian/arch/alpha/config Thu Jan 5 15:59:32 2006
@@ -1691,3 +1691,4 @@
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_JFFS2_FS_WRITEBUFFER=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/amd64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config (original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config Thu Jan 5 15:59:32 2006
@@ -1562,3 +1562,4 @@
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_PM_LEGACY=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config Thu Jan 5 15:59:32 2006
@@ -16,3 +16,4 @@
CONFIG_EQUALIZER=m
CONFIG_NET_CLS_ROUTE=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.footbridge Thu Jan 5 15:59:32 2006
@@ -682,8 +682,6 @@
# Wireless LAN (non-hamradio)
#
# CONFIG_NET_RADIO is not set
-# CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2200=m
#
# Wan interfaces
Modified: people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx (original)
+++ people/waldi/linux-2.6/debian/arch/arm/config.ixp4xx Thu Jan 5 15:59:32 2006
@@ -854,10 +854,6 @@
#
# Wireless 802.11b ISA/PCI cards support
#
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW_DEBUG is not set
-CONFIG_IPW2200=m
CONFIG_HERMES=y
# CONFIG_PLX_HERMES is not set
# CONFIG_TMD_HERMES is not set
Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config (original)
+++ people/waldi/linux-2.6/debian/arch/config Thu Jan 5 15:59:32 2006
@@ -589,7 +589,6 @@
CONFIG_INET_TCP_DIAG=m
CONFIG_RAID_ATTRS=m
CONFIG_USB_NET_CDCETHER=m
-CONFIG_IPW2100=m
CONFIG_DVB_USB_VP702X=m
CONFIG_VIDEO_SAA6588=m
CONFIG_CHELSIO_T1=m
@@ -651,7 +650,6 @@
CONFIG_SENSORS_W83792D=m
CONFIG_RELAYFS_FS=m
CONFIG_IP_NF_NETBIOS_NS=m
-CONFIG_IPW2100_MONITOR=y
CONFIG_NORTEL_HERMES=m
CONFIG_USB_EMI26=m
CONFIG_CONNECTOR=m
Modified: people/waldi/linux-2.6/debian/arch/hppa/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/hppa/config (original)
+++ people/waldi/linux-2.6/debian/arch/hppa/config Thu Jan 5 15:59:32 2006
@@ -970,3 +970,4 @@
# CONFIG_DISCONTIGMEM_MANUAL is not set
CONFIG_SCSI_SYM53C8XX_MMIO=y
CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config (original)
+++ people/waldi/linux-2.6/debian/arch/i386/config Thu Jan 5 15:59:32 2006
@@ -1823,3 +1823,5 @@
# CONFIG_DISCONTIGMEM_MANUAL is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
Modified: people/waldi/linux-2.6/debian/arch/ia64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/ia64/config (original)
+++ people/waldi/linux-2.6/debian/arch/ia64/config Thu Jan 5 15:59:32 2006
@@ -1368,3 +1368,4 @@
CONFIG_DIGIEPCA=m
# CONFIG_CPU_FREQ is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/m68k/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/config (original)
+++ people/waldi/linux-2.6/debian/arch/m68k/config Thu Jan 5 15:59:32 2006
@@ -346,3 +346,4 @@
CONFIG_IEEE80211_CRYPT_TKIP=n
CONFIG_IEEE80211_CRYPT_WEP=n
CONFIG_IEEE80211=n
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config (original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config Thu Jan 5 15:59:32 2006
@@ -1273,3 +1273,4 @@
CONFIG_XMON=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/s390/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/config (original)
+++ people/waldi/linux-2.6/debian/arch/s390/config Thu Jan 5 15:59:32 2006
@@ -175,3 +175,4 @@
CONFIG_CRC32=m
CONFIG_KEXEC=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/arch/sparc/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/config (original)
+++ people/waldi/linux-2.6/debian/arch/sparc/config Thu Jan 5 15:59:32 2006
@@ -473,3 +473,4 @@
CONFIG_MEGARAID_MAILBOX=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_IPW2100 is not set
Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog (original)
+++ people/waldi/linux-2.6/debian/changelog Thu Jan 5 15:59:32 2006
@@ -6,7 +6,11 @@
[ dann frazier ]
* [ia64] Update config for 2.6.15.
- -- dann frazier <dannf at debian.org> Tue, 3 Jan 2006 21:46:44 -0700
+ [ Frederik Schüler ]
+ * Make CONFIG_IPW2100 a per-architecture option and deactivate it on all
+ architectures but i386. (Closes: #344515)
+
+ -- Frederik Schüler <fs at debian.org> Thu, 5 Jan 2006 14:19:56 +0100
linux-2.6 (2.6.15-1) unstable; urgency=low
More information about the Kernel-svn-changes
mailing list