ramips: merge slab patch
authorGabor Juhos <juhosg@openwrt.org>
Fri, 28 May 2010 19:45:28 +0000 (19:45 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Fri, 28 May 2010 19:45:28 +0000 (19:45 +0000)
SVN-Revision: 21607

target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
target/linux/ramips/patches-2.6.34/105-slab.patch [deleted file]

index f323001..4d936d0 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "linux/init.h"
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/mach-ralink/dev-gpio-buttons.h>
 
index 2ab187d..a45a7cb 100644 (file)
@@ -10,6 +10,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/mach-ralink/dev-gpio-leds.h>
 
diff --git a/target/linux/ramips/patches-2.6.34/105-slab.patch b/target/linux/ramips/patches-2.6.34/105-slab.patch
deleted file mode 100644 (file)
index 3ee300d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/ralink/common/dev-gpio-buttons.c
-+++ b/arch/mips/ralink/common/dev-gpio-buttons.c
-@@ -10,6 +10,7 @@
- #include "linux/init.h"
- #include <linux/platform_device.h>
-+#include <linux/slab.h>
- #include <asm/mach-ralink/dev-gpio-buttons.h>
---- a/arch/mips/ralink/common/dev-gpio-leds.c
-+++ b/arch/mips/ralink/common/dev-gpio-leds.c
-@@ -10,6 +10,7 @@
- #include <linux/init.h>
- #include <linux/platform_device.h>
-+#include <linux/slab.h>
- #include <asm/mach-ralink/dev-gpio-leds.h>