diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 00:56:30 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 00:57:10 +0200 |
| commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
| tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /arch/arm/mach-sa1100/shannon.c | |
| parent | Merge branch 'sa11x0-lcd' into sa11x0 (diff) | |
| parent | MFD: mcp-sa11x0/assabet: move assabet reset handling out of mcp-sa11x0.c (diff) | |
| download | linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.xz linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.zip | |
Merge branch 'sa11x0-mcp' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Diffstat (limited to 'arch/arm/mach-sa1100/shannon.c')
| -rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 77b2b9b522ac..08bb1228961f 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c @@ -72,6 +72,7 @@ static struct sa1100fb_mach_info shannon_lcd_info = { static void __init shannon_init(void) { + sa11x0_ppc_configure_mcp(); sa11x0_register_lcd(&shannon_lcd_info); sa11x0_register_mtd(&shannon_flash_data, &shannon_flash_resource, 1); sa11x0_register_mcp(&shannon_mcp_data); |