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

svn path=/dists/sid/linux-2.6/; revision=18174
This commit is contained in:
Ben Hutchings 2011-10-24 09:24:56 +00:00
parent 7c7ec14458
commit 030c9eeee3
2 changed files with 3 additions and 1 deletions

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ linux-2.6 (3.0.0-6) UNRELEASED; urgency=low
[ 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@pengutronix.de> Fri, 07 Oct 2011 15:48:22 +0200

View File

@ -78,6 +78,7 @@ CONFIG_PROC_PREPRESIDUAL=y
##
## 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_SIL680=m
CONFIG_PATA_VIA=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_MACIO=m
CONFIG_PATA_MACIO=y
##
## file: drivers/atm/Kconfig