projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/misc
[powerpc.git]
/
arch
/
arm
/
mach-at91
/
board-sam9261ek.c
diff --git
a/arch/arm/mach-at91/board-sam9261ek.c
b/arch/arm/mach-at91/board-sam9261ek.c
index
25d6263
..
b7e7724
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9261ek.c
+++ b/
arch/arm/mach-at91/board-sam9261ek.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/arch/arm/mach-at91/board-ek.c
+ * linux/arch/arm/mach-at91/board-
sam9261
ek.c
*
* Copyright (C) 2005 SAN People
* Copyright (C) 2006 Atmel
*
* Copyright (C) 2005 SAN People
* Copyright (C) 2006 Atmel
@@
-243,7
+243,7
@@
static void __init ek_board_init(void)
at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
#else
/* MMC */
at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
#else
/* MMC */
- at91_add_device_mmc(&ek_mmc_data);
+ at91_add_device_mmc(
0,
&ek_mmc_data);
#endif
}
#endif
}