aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-05-28 19:45:28 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-05-28 19:45:28 +0000
commitc24397b38529e560214e656462af5cc2c6780336 (patch)
tree33bccbbdd3658c11953ff527062aa4c36adbc850 /target/linux
parent7ac21ada5557961676da562c0779af3bd565ad4e (diff)
downloadupstream-c24397b38529e560214e656462af5cc2c6780336.tar.gz
upstream-c24397b38529e560214e656462af5cc2c6780336.tar.bz2
upstream-c24397b38529e560214e656462af5cc2c6780336.zip
ramips: merge slab patch
SVN-Revision: 21607
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-buttons.c1
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/common/dev-gpio-leds.c1
-rw-r--r--target/linux/ramips/patches-2.6.34/105-slab.patch20
3 files changed, 2 insertions, 20 deletions
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 f323001298..4d936d05c2 100644
--- 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/slab.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 2ab187d152..a45a7cb779 100644
--- 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/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
index 3ee300db5b..0000000000
--- 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>
-