From: acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Apr 2010 14:43:41 +0000 (+0000)
Subject: x86: prepare for kernels 2.6.33 & 2.6.34
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/64eda22d9bad650c779b5e07a833890d40f2ef19

x86: prepare for kernels 2.6.33 & 2.6.34


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21196 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch b/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch
new file mode 100644
index 000000000..62cf4aabc
--- /dev/null
+++ b/target/linux/x86/patches-2.6.32/100-geode_mfgpt_irq.patch
@@ -0,0 +1,11 @@
+--- a/arch/x86/kernel/mfgpt_32.c	2010-03-15 09:52:04.000000000 -0600
++++ b/arch/x86/kernel/mfgpt_32.c	2010-04-08 17:31:56.000000000 -0600
+@@ -33,7 +33,7 @@
+ #include <linux/module.h>
+ #include <asm/geode.h>
+
+-#define MFGPT_DEFAULT_IRQ	7
++#define MFGPT_DEFAULT_IRQ	6
+
+ static struct mfgpt_timer_t {
+ 	unsigned int avail:1;
diff --git a/target/linux/x86/patches/100-geode_mfgpt_irq.patch b/target/linux/x86/patches/100-geode_mfgpt_irq.patch
deleted file mode 100644
index 62cf4aabc..000000000
--- a/target/linux/x86/patches/100-geode_mfgpt_irq.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/x86/kernel/mfgpt_32.c	2010-03-15 09:52:04.000000000 -0600
-+++ b/arch/x86/kernel/mfgpt_32.c	2010-04-08 17:31:56.000000000 -0600
-@@ -33,7 +33,7 @@
- #include <linux/module.h>
- #include <asm/geode.h>
-
--#define MFGPT_DEFAULT_IRQ	7
-+#define MFGPT_DEFAULT_IRQ	6
-
- static struct mfgpt_timer_t {
- 	unsigned int avail:1;