[kernel] r11012 - in dists/etch/linux-2.6.24/debian: . config/arm

[Dann Frazier]

Author: dannf
Date: Sun Mar 30 21:18:27 2008
New Revision: 11012

Log:
merge arm/ip32x changes pending for 2.6.24-6

Modified:
   dists/etch/linux-2.6.24/debian/changelog
   dists/etch/linux-2.6.24/debian/config/arm/config.iop32x

Modified: dists/etch/linux-2.6.24/debian/changelog
==============================================================================
--- dists/etch/linux-2.6.24/debian/changelog	(original)
+++ dists/etch/linux-2.6.24/debian/changelog	Sun Mar 30 21:18:27 2008
@@ -17,7 +17,12 @@
   * [mips/r5k-ip32] Use the generic config options for NFS, which will
     enable NFSv4. (closes: #471007)
 
- -- Bastian Blank <waldi at debian.org>  Mon, 17 Mar 2008 11:46:39 +0100
+  * Merge changes pending 2.6.24-6:
+    [Gordon Farquharson ]
+    * [arm/iop32x] Do not build the ARTOP PATA driver (PATA_ARTOP).
+    * [arm/iop32x] Enable MTD_CMDLINE_PARTS.
+
+ -- dann frazier <dannf at debian.org>  Mon, 17 Mar 2008 11:46:39 +0100
 
 linux-2.6 (2.6.24-5) unstable; urgency=low
 

Modified: dists/etch/linux-2.6.24/debian/config/arm/config.iop32x
==============================================================================
--- dists/etch/linux-2.6.24/debian/config/arm/config.iop32x	(original)
+++ dists/etch/linux-2.6.24/debian/config/arm/config.iop32x	Sun Mar 30 21:18:27 2008
@@ -325,7 +325,7 @@
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 
 #
@@ -550,6 +550,7 @@
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
+# CONFIG_PATA_ARTOP is not set
 
 #
 # Multi-device support (RAID and LVM)