[kernel] r12244 - in dists/sid/linux-2.6/debian: . config/i386

[Bastian Blank]

Author: waldi
Date: Sun Sep 21 13:38:41 2008
New Revision: 12244

Log:
[i386] Enable IDE ACPI support.

* debian/changelog: Update.
* debian/config/i386/config: Ignore ABI changes.
* debian/config/i386/defines: Set BLK_DEV_IDEACPI.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/i386/config
   dists/sid/linux-2.6/debian/config/i386/defines

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 21 13:38:41 2008
@@ -7,6 +7,7 @@
   * Allow forced module loading again. (closes: #494144)
   * Set (wireless) IEEE 802.11 regulatory domain default to EU.
     (closes: #497971)
+  * [i386] Enable IDE ACPI support. Override ABI changes. (closes: #470528)
 
   [ Martin Michlmayr ]
   * Fix dead 21041 ethernet after ifconfig down (Thomas Bogendoerfer).

Modified: dists/sid/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/config	(original)
+++ dists/sid/linux-2.6/debian/config/i386/config	Sun Sep 21 13:38:41 2008
@@ -556,7 +556,7 @@
 CONFIG_BLK_DEV_IDECD=m
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
-# CONFIG_BLK_DEV_IDEACPI is not set
+CONFIG_BLK_DEV_IDEACPI=y
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_CMD640=y
 # CONFIG_BLK_DEV_CMD640_ENHANCED is not set

Modified: dists/sid/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/defines	(original)
+++ dists/sid/linux-2.6/debian/config/i386/defines	Sun Sep 21 13:38:41 2008
@@ -1,3 +1,12 @@
+[abi]
+ignore-changes:
+ # BLK_DEV_IDEACPI
+ ide_* __ide_*
+ default_hwif_mmiops
+ do_rw_taskfile
+ drive_is_ready
+ generic_ide_ioctl
+
 [base]
 featuresets:
  openvz