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

[Ben Hutchings]

Author: benh
Date: Tue Jun  8 02:40:59 2010
New Revision: 15842

Log:
[powerpc] Enable pata_amd driver, replacing amd74xx

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Jun  8 02:38:58 2010	(r15841)
+++ dists/sid/linux-2.6/debian/changelog	Tue Jun  8 02:40:59 2010	(r15842)
@@ -15,6 +15,7 @@
   * Revert "Add EC path for Thinkpad X100."; it is incomplete and broken
   * sctp: fix append error cause to ERROR chunk correctly (regression due
     to fix for CVE-2010-1173)
+  * [powerpc] Enable pata_amd driver, replacing amd74xx
 
   [ Aurelien Jarno ]
   * [sh4] fix sh_tmu clocksource following recent nohz changes.

Modified: dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	Tue Jun  8 02:38:58 2010	(r15841)
+++ dists/sid/linux-2.6/debian/config/powerpc/config.powerpc64	Tue Jun  8 02:40:59 2010	(r15842)
@@ -89,6 +89,11 @@
 # CONFIG_LPARCFG is not set
 
 ##
+## file: drivers/ata/Kconfig
+##
+CONFIG_PATA_AMD=m
+
+##
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_MAC_FLOPPY is not set
@@ -111,11 +116,6 @@
 CONFIG_I2C_PASEMI=m
 
 ##
-## file: drivers/ide/Kconfig
-##
-CONFIG_BLK_DEV_AMD74XX=m
-
-##
 ## file: drivers/macintosh/Kconfig
 ##
 CONFIG_WINDFARM=m