diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:32:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:32:42 -0800 |
| commit | 749f3cbe1acd60a7bf6ff0396a48a28705096305 (patch) | |
| tree | 12ef5dafe8da5e0e2186643318cd494e0c5e238c /arch/arm/mach-realview/core.h | |
| parent | 6b46362c0ea472b174c336786fd406c504326ad4 (diff) | |
| parent | 65f69e5c16f8eee17b7f71bfad9e8e58f44c7386 (diff) | |
| download | linux-749f3cbe1acd60a7bf6ff0396a48a28705096305.tar.gz linux-749f3cbe1acd60a7bf6ff0396a48a28705096305.tar.bz2 linux-749f3cbe1acd60a7bf6ff0396a48a28705096305.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: Use a definition for the userspace cmpxchg emulation syscall
[ARM] Fix test for unimplemented ARM syscalls
ARM: 5784/1: fix early boot machine ID mismatch error display
[ARM] orion5x: update defconfig
[ARM] Kirkwood: update defconfig
[ARM] Kirkwood: clarify PCIe MEM bus/physical address distinction
[ARM] kirkwood: fix PCI I/O port assignment
[ARM] kirkwood: fix section mismatch
[ARM] OpenRD base: Initialize PCI express and i2c
[ARM] properly report mv78100 stepping A1
ARM: 5780/1: KS8695: Fix macro definition bug in regs-switch.c
ARM: 5779/1: ep93xx/micro9.c: fix implicit declaration of function __raw_readl and IOMEM
RealView: Add sparsemem support for the RealView PBX platform
RealView: Remove duplicated #define REALVIEW_SYS_FLAGS* statements
RealView: Add default memory configuration
Check whether the SCU was already initialised
ARMv7: Check whether the SMP/nAMP mode was already enabled
[ARM] pxa: fix resume failure by saving/restoring IPRx registers
[ARM] pxa/palm: fix incorrect initialization of Palm Tungsten C keyboard
[ARM] pxa/zaurus: fix NAND flash OOB layout for Borzoi
Diffstat (limited to 'arch/arm/mach-realview/core.h')
| -rw-r--r-- | arch/arm/mach-realview/core.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h index 699671fa6e0b..781bca68a9fa 100644 --- a/arch/arm/mach-realview/core.h +++ b/arch/arm/mach-realview/core.h @@ -25,6 +25,7 @@ #include <linux/amba/bus.h> #include <linux/io.h> +#include <asm/setup.h> #include <asm/leds.h> #define AMBA_DEVICE(name,busid,base,plat) \ @@ -44,6 +45,8 @@ static struct amba_device name##_device = { \ /* .dma = base##_DMA,*/ \ } +struct machine_desc; + extern struct platform_device realview_flash_device; extern struct platform_device realview_cf_device; extern struct platform_device realview_i2c_device; @@ -61,5 +64,8 @@ extern void realview_timer_init(unsigned int timer_irq); extern int realview_flash_register(struct resource *res, u32 num); extern int realview_eth_register(const char *name, struct resource *res); extern int realview_usb_register(struct resource *res); +extern void realview_fixup(struct machine_desc *mdesc, struct tag *tags, + char **from, struct meminfo *meminfo); extern void (*realview_reset)(char); + #endif |