lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel

Browse Source
This commit is contained in:
Russell King
2008-12-01 17:53:45 +00:00
committed by Russell King
parent 93982535a2 6f13d27883
commit 657e1de8e7
27 changed files with 1614 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-realview/core.h
View File

@ -51,8 +51,7 @@ extern struct mmc_platform_data realview_mmc1_plat_data;
extern struct clcd_board clcd_plat_data;
extern void __iomem *gic_cpu_base_addr;
#ifdef CONFIG_LOCAL_TIMERS
extern void __iomem *twd_base_addr;
extern unsigned int twd_size;
extern void __iomem *twd_base;
#endif
extern void __iomem *timer0_va_base;
extern void __iomem *timer1_va_base;
@ -62,5 +61,6 @@ extern void __iomem *timer3_va_base;
extern void realview_leds_event(led_event_t ledevt);
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);
#endif