diff --git a/debian/changelog b/debian/changelog
index 4d4462f5d..353e55691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@decadent.org.uk>  Mon, 31 May 2010 18:46:34 +0100
+
 linux-2.6 (2.6.32-14) unstable; urgency=low
 
   [ Ben Hutchings ]
diff --git a/debian/config/defines b/debian/config/defines
index ebca30838..97e692a15 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -4,6 +4,12 @@ ignore-changes: module:crypto/cryptd
  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: