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

[Ben Hutchings]

Author: benh
Date: Mon May 31 17:57:08 2010
New Revision: 15814

Log:
[hppa] Ignore ABI change caused by disabling CONFIG_IDE_TIMINGS

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon May 31 03:58:30 2010	(r15813)
+++ dists/sid/linux-2.6/debian/changelog	Mon May 31 17:57:08 2010	(r15814)
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.32-15) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [hppa] Ignore ABI change caused by disabling CONFIG_IDE_TIMINGS
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 31 May 2010 18:46:34 +0100
+
 linux-2.6 (2.6.32-14) unstable; urgency=low
 
   [ Ben Hutchings ]

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Mon May 31 03:58:30 2010	(r15813)
+++ dists/sid/linux-2.6/debian/config/defines	Mon May 31 17:57:08 2010	(r15814)
@@ -4,6 +4,12 @@
  module:drivers/net/macvlan
  module:drivers/net/macvtap
  module:drivers/net/wireless/iwlwifi/iwlcore
+# CONFIG_IDE_TIMINGS is now disabled on some arches
+# but should not be used by OOT modules
+ ide_pio_cycle_time
+ ide_timing_compute
+ ide_timing_find_mode
+ ide_timing_merge
 
 [base]
 arches: