diff --git a/debian/changelog b/debian/changelog index 2cd36cab4..877d20ce9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,8 +71,6 @@ linux (3.10.5-1) UNRELEASED; urgency=low dev_priv->dev_priv->mm.inactive_list [ Ben Hutchings ] - * [sparc] cpufreq: Convince genksyms that the ABI didn't change - (fixes FTBFS) * [hppa] udeb: Add core-modules package (Closes: #718270) * nl80211: fix another nl80211_fam.attrbuf race * Bump ABI to 2 diff --git a/debian/patches/debian/sparc-cpufreq-convince-genksyms-that-the-abi-didnt-change.patch b/debian/patches/debian/sparc-cpufreq-convince-genksyms-that-the-abi-didnt-change.patch deleted file mode 100644 index ed9fd829f..000000000 --- a/debian/patches/debian/sparc-cpufreq-convince-genksyms-that-the-abi-didnt-change.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Ben Hutchings -Date: Mon, 29 Jul 2013 00:05:51 +0100 -Subject: [sparc] cpufreq: Convince genksyms that the ABI didn't change -Forwarded: not-needed - -genksyms is really stupid: un-including a header whose definitions -didn't appear in the ABI stil changes symbol versions. So restore the -#include for symbol version purposes. - -(This only seems to affect SPARC; on other architectures - may still be indirectly included.) - ---- a/drivers/cpufreq/cpufreq_governor.c -+++ b/drivers/cpufreq/cpufreq_governor.c -@@ -26,6 +26,9 @@ - #include - #include - #include -+#ifdef __GENKSYMS__ -+#include -+#endif - - #include "cpufreq_governor.h" - diff --git a/debian/patches/series b/debian/patches/series index bd3be69cb..146855d81 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -110,7 +110,6 @@ features/all/iwlwifi-bump-required-firmware-API-version-for-3160-.patch # m68k Kconfig bugfix bugfix/m68k/ethernat-kconfig.patch -debian/sparc-cpufreq-convince-genksyms-that-the-abi-didnt-change.patch bugfix/all/nl80211-fix-another-nl80211_fam-attrbuf-race.patch bugfix/all/ext4-fix-retry-handling-in-ext4_ext_truncate.patch bugfix/all/atl1c-Fix-misuse-of-netdev_alloc_skb-in-refilling-rx.patch