summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-20 10:59:21 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-20 10:59:21 +0000
commita452106e886da8d6d8b6d4e0256b125542b72692 (patch)
tree798e78d2556a397acb20c85de7ff237ac94e02f8 /target/linux/generic-2.6/patches-2.6.30
parent832a33e52a311cf11eee98d60f674003b36b09b1 (diff)
[kernel] 2.6.{28,30}: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16934 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch2
3 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch b/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
index 05fd5fbde..018e673e2 100644
--- a/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/004-extra_optimization.patch
@@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
-@@ -566,6 +566,9 @@ endif
+@@ -567,6 +567,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)
diff --git a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch b/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
index 532e00a3a..79fd131c1 100644
--- a/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/750-glamo-headers.patch
@@ -8,8 +8,6 @@
#define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
#define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */
-diff --git a/Kbuild b/Kbuild
-index 3f0eaa3..72699f0 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -75,6 +75,8 @@ header-y += genetlink.h
diff --git a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
index aad8f813d..8ade08a8b 100644
--- a/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/980-vm_exports.patch
@@ -116,7 +116,7 @@
void *caller)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
-@@ -728,6 +728,7 @@ static inline int shmem_lock(struct file
+@@ -726,6 +726,7 @@ static inline int shmem_lock(struct file
#endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);