diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:24:38 -0500 |
| commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
| tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /arch/arm/mach-aaec2000 | |
| parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-aaec2000')
| -rw-r--r-- | arch/arm/mach-aaec2000/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index 50e13965dfe..b5c5fc6ba3a 100644 --- 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 = { | |||
| 212 | 212 | ||
| 213 | static struct amba_device clcd_device = { | 213 | static struct amba_device clcd_device = { |
| 214 | .dev = { | 214 | .dev = { |
| 215 | .bus_id = "mb:16", | 215 | .init_name = "mb:16", |
| 216 | .coherent_dma_mask = ~0, | 216 | .coherent_dma_mask = ~0, |
| 217 | .platform_data = &clcd_plat_data, | 217 | .platform_data = &clcd_plat_data, |
| 218 | }, | 218 | }, |