diff options
| author | Tony Lindgren <tony@atomide.com> | 2006-04-02 17:46:30 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 17:46:30 +0100 |
| commit | 9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102 (patch) | |
| tree | 8b8bf4682ecf602fc35cd98e4ea2e888519b20cb /arch/arm/mach-omap1/board-generic.c | |
| parent | 120db2cba8e40c562e5a4aea44ede2f360a5de75 (diff) | |
| download | linux-stable-9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102.tar.gz linux-stable-9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102.tar.bz2 linux-stable-9b6553cd01ce3ea7a6a532f7b7e62e3535d6b102.zip | |
[ARM] 3433/1: ARM: OMAP: 8/8 Update board files
Patch from Tony Lindgren
This patch syncs OMAP board support with linux-omap tree.
The highlights of the patch are:
- Add support for Nokia 770 by Juha Yrjola
- Add support for Samsung Apollon by Kyungmin Park
- Add support for Amstrad E3 videophone by Jonathan McDowell
- Remove board-netstar.c board support as requested by Ladislav Michl
- Do platform_device registration in board files by Komal Shah et al.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap1/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index a177e78b2b87..33d01adab1ed 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -88,7 +88,7 @@ static struct omap_board_config_kernel generic_config[] = { static void __init omap_generic_init(void) { #ifdef CONFIG_ARCH_OMAP15XX - if (cpu_is_omap1510()) { + if (cpu_is_omap15xx()) { generic_config[0].data = &generic1510_usb_config; } #endif |