OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sa11x0-mcp' into sa11x0
[uclinux-h8/linux.git]
/
arch
/
arm
/
mach-sa1100
/
cerf.c
diff --git
a/arch/arm/mach-sa1100/cerf.c
b/arch/arm/mach-sa1100/cerf.c
index
c2f9ba3
..
8015604
100644
(file)
--- 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);