[oe] [meta-handheld][PATCH 1/3] linux-yocto_3.14: hx4700: v 3.14.4: remove upstreamed patch

[Andrea Adami]

From: Andrea Adami <andrea.adami at gmail.com>

commit id=b98c1e1c1f71ab32e755e2e417e9a682865578b8

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 ...700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch | 35 ----------------------
 recipes-kernel/linux/linux-yocto_3.14.bbappend     |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto-3.14/hx4700/hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch

diff --git a/recipes-kernel/linux/linux-yocto-3.14/hx4700/hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch b/recipes-kernel/linux/linux-yocto-3.14/hx4700/hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch
deleted file mode 100644
index ee92352..0000000
--- a/recipes-kernel/linux/linux-yocto-3.14/hx4700/hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 75249379d18d5bde2d38edb77e1723481d470757 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami at gmail.com>
-Date: Sat, 5 Apr 2014 18:09:07 +0200
-Subject: [PATCH] ARM: pxa: hx4700.h: include "irqs.h" for
- PXA_NR_BUILTIN_GPIO
-
-hx4700 needs the same fix as in 
-9705e74671f0e4f994d86b00cecf441917c64a66
-"ARM: pxa: fix various compilation problems"
-
-Fix build errors. Initial one is:
-/linux/arch/arm/mach-pxa/include/mach/hx4700.h:18:32: error:
- 'PXA_NR_BUILTIN_GPIO' undeclared here (not in a function)
-|  #define HX4700_ASIC3_GPIO_BASE PXA_NR_BUILTIN_GPIO
-
-Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
----
- arch/arm/mach-pxa/include/mach/hx4700.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-pxa/include/mach/hx4700.h b/arch/arm/mach-pxa/include/mach/hx4700.h
-index 8bc0291..0e1bb46 100644
---- a/arch/arm/mach-pxa/include/mach/hx4700.h
-+++ b/arch/arm/mach-pxa/include/mach/hx4700.h
-@@ -14,6 +14,7 @@
- 
- #include <linux/gpio.h>
- #include <linux/mfd/asic3.h>
-+#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */
- 
- #define HX4700_ASIC3_GPIO_BASE	PXA_NR_BUILTIN_GPIO
- #define HX4700_EGPIO_BASE	(HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)
--- 
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 12f910a..9591f1a 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -110,7 +110,6 @@ SRC_URI_append_hx4700 = " \
            file://defconfig \
            file://OE-vga-logo.patch \
            file://hx4700-change-led-trigger-assignments.patch \
-           file://hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch \
            "
 
 SRC_URI_append_poodle = " \
-- 
1.9.1