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 'linus' into tracing/hw-branch-tracing
[pandora-kernel.git]
/
arch
/
arm
/
mach-aaec2000
/
core.c
diff --git
a/arch/arm/mach-aaec2000/core.c
b/arch/arm/mach-aaec2000/core.c
index
50e1396
..
b5c5fc6
100644
(file)
--- a/
arch/arm/mach-aaec2000/core.c
+++ b/
arch/arm/mach-aaec2000/core.c
@@
-212,7
+212,7
@@
static struct clcd_board clcd_plat_data = {
static struct amba_device clcd_device = {
.dev = {
- .
bus_id
= "mb:16",
+ .
init_name
= "mb:16",
.coherent_dma_mask = ~0,
.platform_data = &clcd_plat_data,
},