[kernel] r18174 - in dists/sid/linux-2.6/debian: . config/powerpc

[Ben Hutchings]

Author: benh
Date: Mon Oct 24 09:24:56 2011
New Revision: 18174

Log:
[powerpc] Change ATA, PATA_MACIO from module to built-in (Closes: #641210)

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/powerpc/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Oct 22 00:07:42 2011	(r18173)
+++ dists/sid/linux-2.6/debian/changelog	Mon Oct 24 09:24:56 2011	(r18174)
@@ -13,6 +13,7 @@
 
   [ Ben Hutchings ]
   * cputimer: Cure lock inversion
+  * [powerpc] Change ATA, PATA_MACIO from module to built-in (Closes: #641210)
 
  -- Uwe Kleine-König <u.kleine-koenig at pengutronix.de>  Fri, 07 Oct 2011 15:48:22 +0200
 

Modified: dists/sid/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config	Sat Oct 22 00:07:42 2011	(r18173)
+++ dists/sid/linux-2.6/debian/config/powerpc/config	Mon Oct 24 09:24:56 2011	(r18174)
@@ -78,6 +78,7 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
+CONFIG_ATA=y
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87415=m
 CONFIG_PATA_PDC2027X=m
@@ -87,7 +88,7 @@
 CONFIG_PATA_VIA=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_MACIO=m
+CONFIG_PATA_MACIO=y
 
 ##
 ## file: drivers/atm/Kconfig