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

Maximilian Attems maks at alioth.debian.org
Wed May 27 11:24:17 UTC 2009 

Author: maks
Date: Wed May 27 11:24:16 2009
New Revision: 13681

Log:
clean up old config options step 2

- igb: remove LRO Kconfig option
  5fbbcb79e5371d99565826a352c1003d0f1f0678

- HID: remove compat stuff
  afa5eb7c68689ced4284f01c96feed44a2d0a127

- cfg80211/nl80211: remove usage of CONFIG_NL80211
  633e24ed95b6c87b42f201ecb65c12a75a5a7eef

- tridentfb: delete acceleration Kconfig option
  04645fc337eef283887d3b1204017f1860ed2ff7

- ide: merge ide_arm and ide_generic host drivers
  4465461ece2b9249d6c0cf57bc0002100823e361

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.iop32x
   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/m68k/config.amiga
   dists/trunk/linux-2.6/debian/config/m68k/config.atari
   dists/trunk/linux-2.6/debian/config/m68k/config.mac
   dists/trunk/linux-2.6/debian/config/m68k/config.q40
   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/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   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/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Wed May 27 11:24:16 2009	(r13681)
@@ -1399,8 +1399,6 @@
 ##
 ## file: unknown
 ##
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_IDE_ARM is not set
 CONFIG_SND_CS4232=m
 CONFIG_WDT_501=y
 

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 27 11:24:16 2009	(r13681)
@@ -1448,8 +1448,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 CONFIG_X86_PC=y
 CONFIG_X86_POWERNOW_K8_ACPI=y
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Wed May 27 11:24:16 2009	(r13681)
@@ -1470,7 +1470,6 @@
 ##
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_SND_CS4232 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x	Wed May 27 11:24:16 2009	(r13681)
@@ -905,6 +905,5 @@
 ##
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_NO_IDLE_HZ is not set
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/config	Wed May 27 11:24:16 2009	(r13681)
@@ -3621,9 +3621,6 @@
 ## file: unknown
 ##
 # CONFIG_DYNAMIC_PRINTK_DEBUG is not set
-CONFIG_HID_COMPAT=y
-# CONFIG_IGB_LRO is not set
 # CONFIG_KPROBES is not set
-CONFIG_NL80211=y
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 

Modified: dists/trunk/linux-2.6/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/hppa/config	Wed May 27 11:24:16 2009	(r13681)
@@ -833,6 +833,5 @@
 ##
 ## file: unknown
 ##
-# CONFIG_IDE_ARM is not set
 # CONFIG_SND_CS4232 is not set
 

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Wed May 27 11:24:16 2009	(r13681)
@@ -1667,8 +1667,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 CONFIG_SND_CS4232=m
 CONFIG_WDT_501=y
 # CONFIG_X86_GENERICARCH is not set

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Wed May 27 11:24:16 2009	(r13681)
@@ -964,8 +964,3 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
-##
-## file: unknown
-##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga	Wed May 27 11:24:16 2009	(r13681)
@@ -298,7 +298,6 @@
 # CONFIG_FB_CYBER is not set
 # CONFIG_FB_RETINAZ3 is not set
 # CONFIG_FB_VIRGE is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_OKTAGON_SCSI is not set
 CONFIG_SCSI_AMIGA7XX=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Wed May 27 11:24:16 2009	(r13681)
@@ -224,7 +224,6 @@
 CONFIG_ATARI_ROM_ISA=y
 CONFIG_ATARI_SCC=y
 CONFIG_ATARI_SCC_DMA=y
-# CONFIG_IDE_ARM is not set
 CONFIG_NATFEAT=y
 CONFIG_NFBLOCK=y
 CONFIG_NFCON=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.mac	Wed May 27 11:24:16 2009	(r13681)
@@ -212,8 +212,3 @@
 ##
 # CONFIG_SOUND is not set
 
-##
-## file: unknown
-##
-# CONFIG_IDE_ARM is not set
-

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.q40	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.q40	Wed May 27 11:24:16 2009	(r13681)
@@ -28,7 +28,6 @@
 # disable IDETAPE, causes ICE
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_ARM is not set
 CONFIG_BLK_DEV_Q40IDE=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_BLK_DEV_HD is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Wed May 27 11:24:16 2009	(r13681)
@@ -1684,8 +1684,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Wed May 27 11:24:16 2009	(r13681)
@@ -1986,8 +1986,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Wed May 27 11:24:16 2009	(r13681)
@@ -1022,7 +1022,6 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Wed May 27 11:24:16 2009	(r13681)
@@ -1051,8 +1051,6 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta	Wed May 27 11:24:16 2009	(r13681)
@@ -1666,8 +1666,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta	Wed May 27 11:24:16 2009	(r13681)
@@ -1981,8 +1981,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_MARKEINS is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Wed May 27 11:24:16 2009	(r13681)
@@ -916,7 +916,6 @@
 ##
 ## file: unknown
 ##
-# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a	Wed May 27 11:24:16 2009	(r13681)
@@ -1022,7 +1022,6 @@
 ## file: unknown
 ##
 CONFIG_BLK_DEV_IDE_SWARM=y
-# CONFIG_FB_TRIDENT_ACCEL is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b	Wed May 27 11:24:16 2009	(r13681)
@@ -1050,8 +1050,6 @@
 ## file: unknown
 ##
 # CONFIG_BLK_DEV_IDE_SWARM is not set
-# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_IDE_ARM is not set
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Wed May 27 11:24:16 2009	(r13681)
@@ -1127,7 +1127,5 @@
 ##
 ## file: unknown
 ##
-CONFIG_FB_TRIDENT_ACCEL=y
-# CONFIG_IDE_ARM is not set
 CONFIG_RTC_DRV_PPC=y
 

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64	Wed May 27 11:24:16 2009	(r13681)
@@ -414,8 +414,3 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
-##
-## file: unknown
-##
-# CONFIG_IDE_ARM is not set
-

Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Wed May 27 11:24:09 2009	(r13680)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp	Wed May 27 11:24:16 2009	(r13681)
@@ -416,8 +416,3 @@
 CONFIG_SND_ENS1371=m
 CONFIG_SND_MAESTRO3=m
 
-##
-## file: unknown
-##
-# CONFIG_IDE_ARM is not set
-

More information about the Kernel-svn-changes mailing list