diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 14:59:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 14:59:44 -0500 |
| commit | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (patch) | |
| tree | 289dcbda5fbca34e7e0cf028908b9b517fa8b8b2 /arch/arm/mach-netx | |
| parent | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (diff) | |
| parent | 75c06963dd947252271ffa6107a25cddb2b8f362 (diff) | |
Merge branch 'amba' into for-armsoc
Diffstat (limited to 'arch/arm/mach-netx')
| -rw-r--r-- | arch/arm/mach-netx/fb.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c index b9913234bbf6..2cdf6ef69bee 100644 --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c | |||
| @@ -92,18 +92,7 @@ void clk_put(struct clk *clk) | |||
| 92 | { | 92 | { |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | static struct amba_device fb_device = { | 95 | static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL); |
| 96 | .dev = { | ||
| 97 | .init_name = "fb", | ||
| 98 | .coherent_dma_mask = ~0, | ||
| 99 | }, | ||
| 100 | .res = { | ||
| 101 | .start = 0x00104000, | ||
| 102 | .end = 0x00104fff, | ||
| 103 | .flags = IORESOURCE_MEM, | ||
| 104 | }, | ||
| 105 | .irq = { NETX_IRQ_LCD, NO_IRQ }, | ||
| 106 | }; | ||
| 107 | 96 | ||
| 108 | int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) | 97 | int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) |
| 109 | { | 98 | { |