[kernel] r17821 - in dists/sid/linux-2.6/debian: . config/kernelarch-x86

[Ben Hutchings]

Author: benh
Date: Fri Jul  8 01:14:25 2011
New Revision: 17821

Log:
[amd64] Enable PCMCIA_AHA152X as module (Closes: #632929)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config
   dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Fri Jul  8 01:07:49 2011	(r17820)
+++ dists/sid/linux-2.6/debian/changelog	Fri Jul  8 01:14:25 2011	(r17821)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.39-4) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [amd64] Enable PCMCIA_AHA152X as module (Closes: #632929)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 08 Jul 2011 02:10:52 +0100
+
 linux-2.6 (2.6.39-3) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Jul  8 01:07:49 2011	(r17820)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config	Fri Jul  8 01:14:25 2011	(r17821)
@@ -1049,6 +1049,7 @@
 ##
 ## file: drivers/scsi/pcmcia/Kconfig
 ##
+CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m

Modified: dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Jul  8 01:07:49 2011	(r17820)
+++ dists/sid/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Jul  8 01:14:25 2011	(r17821)
@@ -341,7 +341,6 @@
 ##
 ## file: drivers/scsi/pcmcia/Kconfig
 ##
-CONFIG_PCMCIA_AHA152X=m
 CONFIG_PCMCIA_NINJA_SCSI=m
 
 ##