update 3.1 patches
SVN-Revision: 28814
This commit is contained in:
parent
c4bc2552a3
commit
cc2cf8f3d5
4 changed files with 10 additions and 55 deletions
|
@ -1,45 +0,0 @@
|
|||
From b1bd6bd7c230e00b40b0b859f3c23eb56ef39f0c Mon Sep 17 00:00:00 2001
|
||||
From: Imre Kaloz <kaloz@openwrt.org>
|
||||
Date: Fri, 2 Sep 2011 08:07:00 +0200
|
||||
Subject: [PATCH] ARM: remove missing cns3xxx includes
|
||||
|
||||
Commit c9d95fbe59e426eed7f16e7cac812e46ac4772d0 deleted cns3xxx' hardware.h,
|
||||
but didn't remove references for it, breaking the build.
|
||||
|
||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||
---
|
||||
arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 1 -
|
||||
arch/arm/mach-cns3xxx/include/mach/system.h | 1 -
|
||||
arch/arm/mach-cns3xxx/include/mach/uncompress.h | 1 -
|
||||
3 files changed, 0 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
|
||||
+++ b/arch/arm/mach-cns3xxx/include/mach/entry-macro.S
|
||||
@@ -8,7 +8,6 @@
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
-#include <mach/hardware.h>
|
||||
#include <asm/hardware/entry-macro-gic.S>
|
||||
|
||||
.macro disable_fiq
|
||||
--- a/arch/arm/mach-cns3xxx/include/mach/system.h
|
||||
+++ b/arch/arm/mach-cns3xxx/include/mach/system.h
|
||||
@@ -13,7 +13,6 @@
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <asm/proc-fns.h>
|
||||
-#include <mach/hardware.h>
|
||||
|
||||
static inline void arch_idle(void)
|
||||
{
|
||||
--- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h
|
||||
+++ b/arch/arm/mach-cns3xxx/include/mach/uncompress.h
|
||||
@@ -8,7 +8,6 @@
|
||||
*/
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
-#include <mach/hardware.h>
|
||||
#include <mach/cns3xxx.h>
|
||||
|
||||
#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00))
|
|
@ -404,7 +404,7 @@
|
|||
+}
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1350,7 +1350,7 @@ config SMP
|
||||
@@ -1376,7 +1376,7 @@ config SMP
|
||||
depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
|
||||
MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
|
||||
ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
|
||||
|
|
|
@ -980,13 +980,13 @@
|
|||
pm_power_off = cns3xxx_power_off;
|
||||
}
|
||||
|
||||
--- a/arch/arm/mach-cns3xxx/include/mach/platform.h
|
||||
+++ b/arch/arm/mach-cns3xxx/include/mach/platform.h
|
||||
@@ -22,5 +22,7 @@ struct cns3xxx_plat_info {
|
||||
u32 phy[3];
|
||||
};
|
||||
--- a/arch/arm/mach-cns3xxx/core.h
|
||||
+++ b/arch/arm/mach-cns3xxx/core.h
|
||||
@@ -12,6 +12,7 @@
|
||||
#define __CNS3XXX_CORE_H
|
||||
|
||||
extern struct sys_timer cns3xxx_timer;
|
||||
+extern int cns3xxx_pcie_init(u8 bitmap);
|
||||
+
|
||||
#endif /* __ASM_ARCH_PLATFORM_H */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_CACHE_L2X0
|
||||
void __init cns3xxx_l2x0_init(void);
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
/* used by entry-macro.S */
|
||||
--- a/arch/arm/mach-cns3xxx/core.h
|
||||
+++ b/arch/arm/mach-cns3xxx/core.h
|
||||
@@ -19,7 +19,7 @@ void __init cns3xxx_l2x0_init(void);
|
||||
@@ -20,7 +20,7 @@ void __init cns3xxx_l2x0_init(void);
|
||||
static inline void cns3xxx_l2x0_init(void) {}
|
||||
#endif /* CONFIG_CACHE_L2X0 */
|
||||
|
||||
|
|
Loading…
Reference in a new issue