From 030c9eeee3bceeaaa0cf889525841f24eac21d8c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 24 Oct 2011 09:24:56 +0000 Subject: [PATCH] [powerpc] Change ATA, PATA_MACIO from module to built-in (Closes: #641210) svn path=/dists/sid/linux-2.6/; revision=18174 --- debian/changelog | 1 + debian/config/powerpc/config | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f88d90020..c23acea85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 07 Oct 2011 15:48:22 +0200 diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index db23873bd..b58b72673 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -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