ramips: merge slab patch

SVN-Revision: 21607

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
index f3230012982d93263bb369814dcb760db01ae0f0..4d936d05c24743c1059923388f58de81272fe80f 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c
@@ -10,6 +10,7 @@
 
 #include "linux/init.h"
 #include <linux/platform_device.h>
 
 #include "linux/init.h"
 #include <linux/platform_device.h>

+#include <linux/slab.h>

 
 #include <asm/mach-ralink/dev-gpio-buttons.h>
 
 
 #include <asm/mach-ralink/dev-gpio-buttons.h>
 

diff --git a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
index 2ab187d152be6cbc939994fe15791c2a002547d7..a45a7cb779a9d03fa5726d3b27abeb8cfb1aea36 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
+++ b/target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c
@@ -10,6 +10,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
 #include <linux/init.h>
 #include <linux/platform_device.h>

+#include <linux/slab.h>

 
 #include <asm/mach-ralink/dev-gpio-leds.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
--- a/target/linux/ramips/patches-2.6.34/105-slab.patch
+++ /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>
-