diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 19:06:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 19:06:37 +0100 |
| commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
| tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /arch/arm/mach-pxa/gumstix.c | |
| parent | [ARM] s3c: S3C options should depend on PLAT_S3C (diff) | |
| parent | [ARM] pxa/littleton: add preliminary I2C board info (da9034 + max7320) (diff) | |
| download | linux-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.tar.xz linux-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'arch/arm/mach-pxa/gumstix.c')
| -rw-r--r-- | arch/arm/mach-pxa/gumstix.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index 06bc6674b015..e296ce11658c 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c @@ -186,6 +186,20 @@ static unsigned long gumstix_pin_config[] __initdata = { GPIO8_MMC_CS0, }; +int __attribute__((weak)) am200_init(void) +{ + return 0; +} + +static void __init carrier_board_init(void) +{ + /* + * put carrier/expansion board init here if + * they cannot be detected programatically + */ + am200_init(); +} + static void __init gumstix_init(void) { pxa2xx_mfp_config(ARRAY_AND_SIZE(gumstix_pin_config)); @@ -194,6 +208,7 @@ static void __init gumstix_init(void) gumstix_udc_init(); gumstix_mmc_init(); (void) platform_add_devices(devices, ARRAY_SIZE(devices)); + carrier_board_init(); } MACHINE_START(GUMSTIX, "Gumstix") |