diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 02:56:30 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-26 02:57:10 +0400 |
| commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
| tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /arch/arm/mach-sa1100/cerf.c | |
| parent | 18bbff9f679cd470db66402fdb9c577b34324183 (diff) | |
| parent | 6ed3e2acc7995625625592abe8cd3383c34a471b (diff) | |
| download | linux-7256ecc2b7b91b4212ccc5511cb12254bdf806d0.tar.xz | |
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/cerf.c')
| -rw-r--r-- | arch/arm/mach-sa1100/cerf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index c2f9ba3a9578..8015604cfc22 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c @@ -121,6 +121,7 @@ static struct mcp_plat_data cerf_mcp_data = { static void __init cerf_init(void) { + sa11x0_ppc_configure_mcp(); platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices)); sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1); sa11x0_register_mcp(&cerf_mcp_data); |