From 221e81adfe1191946825d97ada36e0fd856e8176 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 23 Jun 2012 19:19:24 +0000 Subject: [PATCH] [i386] cpufreq/gx: Fix the compile error svn path=/dists/sid/linux/; revision=19184 --- debian/changelog | 6 ++++ .../cpufreq-gx-Fix-the-compile-error.patch | 28 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 35 insertions(+) create mode 100644 debian/patches/features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch diff --git a/debian/changelog b/debian/changelog index ef3f26cc9..7b5fcbb46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (3.2.21-2) UNRELEASED; urgency=low + + * [i386] cpufreq/gx: Fix the compile error + + -- Ben Hutchings Sat, 23 Jun 2012 20:19:15 +0100 + linux (3.2.21-1) unstable; urgency=low * New upstream stable update: diff --git a/debian/patches/features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch b/debian/patches/features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch new file mode 100644 index 000000000..5f82c03d3 --- /dev/null +++ b/debian/patches/features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch @@ -0,0 +1,28 @@ +From: Alan Cox +Date: Mon, 30 Jan 2012 14:47:28 +0000 +Subject: cpufreq/gx: Fix the compile error + +commit b3012e12cdc5825f93367cc6294419e7ab1f00cc upstream. + +Someone forgot to test this one it seems. + +Signed-off-by: Alan Cox +Acked-by: Andi Kleen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/cpufreq/gx-suspmod.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/cpufreq/gx-suspmod.c b/drivers/cpufreq/gx-suspmod.c +index 5a06c0b..456bee0 100644 +--- a/drivers/cpufreq/gx-suspmod.c ++++ b/drivers/cpufreq/gx-suspmod.c +@@ -172,7 +172,7 @@ static struct pci_device_id gx_chipset_tbl[] __initdata = { + { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5510), }, + { 0, }, + }; +-MODULE_DEVICE_TABLE(gx_chipset_tbl); ++MODULE_DEVICE_TABLE(pci, gx_chipset_tbl); + + static void gx_write_byte(int reg, int value) + { diff --git a/debian/patches/series b/debian/patches/series index 740739006..22a5c6cb2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -340,6 +340,7 @@ features/all/cpu-devices/powernow-k7-Fix-CPU-family-number.patch features/all/cpu-devices/powernow-k6-Really-enable-auto-loading.patch features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch features/all/cpu-devices/Partially-revert-cpufreq-Add-support-for-x86-cpuinfo.patch +features/all/cpu-devices/cpufreq-gx-Fix-the-compile-error.patch features/arm/kirkwood-add-dreamplug-fdt-support.patch features/arm/kirkwood-fdt-convert-uart0-to-devicetree.patch