diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2014-05-30 00:56:07 +0200 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-06-03 21:57:02 +0100 |
| commit | dac17673f683805bbb8bea643725c48a1afecf7c (patch) | |
| tree | 0c5d03339cce2089c1ca931fdd7decbfd0b48a34 | |
| parent | ad6f63af1abcc44b8c88235b0372b401fe554a21 (diff) | |
| download | meta-handheld-dac17673f683805bbb8bea643725c48a1afecf7c.tar.gz | |
linux-yocto_3.14: hx4700: v 3.14.4: remove upstreamed patch
commit id=b98c1e1c1f71ab32e755e2e417e9a682865578b8
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-3.14/hx4700/hx4700.h-include-irqs.h-for-PXA_NR_BUILTIN_G.patch | 35 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-yocto_3.14.bbappend | 1 |
2 files changed, 0 insertions, 36 deletions
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@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@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 = " \ |