git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri-pxa300.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa300.c
b/arch/arm/mach-pxa/colibri-pxa300.c
index
7c9c34c
..
37c239c
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa300.c
+++ b/
arch/arm/mach-pxa/colibri-pxa300.c
@@
-172,6
+172,7
@@
void __init colibri_pxa300_init(void)
{
colibri_pxa300_init_eth();
colibri_pxa300_init_ohci();
+ colibri_pxa3xx_init_nand();
colibri_pxa300_init_lcd();
colibri_pxa3xx_init_lcd(mfp_to_gpio(GPIO39_GPIO));
colibri_pxa310_init_ac97();