diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-05-28 19:45:28 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-05-28 19:45:28 +0000 |
commit | 464c781c2b65a1859de3d26dff6ee2c6c34fb8ac (patch) | |
tree | 05fb525769281fcc8d97d4bd0a80ed193f588119 | |
parent | 5430b616f42252452204da843b21d4c6f512bc48 (diff) | |
download | master-187ad058-464c781c2b65a1859de3d26dff6ee2c6c34fb8ac.tar.gz master-187ad058-464c781c2b65a1859de3d26dff6ee2c6c34fb8ac.tar.bz2 master-187ad058-464c781c2b65a1859de3d26dff6ee2c6c34fb8ac.zip |
ramips: merge slab patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21607 3c298f89-4303-0410-b956-a3cf2f4a3e73
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> - |