From c24397b38529e560214e656462af5cc2c6780336 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 28 May 2010 19:45:28 +0000
Subject: ramips: merge slab patch

SVN-Revision: 21607
---
 .../files/arch/mips/ralink/common/dev-gpio-buttons.c |  1 +
 .../files/arch/mips/ralink/common/dev-gpio-leds.c    |  1 +
 target/linux/ramips/patches-2.6.34/105-slab.patch    | 20 --------------------
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 target/linux/ramips/patches-2.6.34/105-slab.patch

(limited to 'target')

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>
- 
-- 
cgit v1.2.3