diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 06:13:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 06:13:06 -0400 |
| commit | 710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch) | |
| tree | f9b09b722bf511841539173d946f90a20fc2e59a /arch/arm/mach-netx/fb.c | |
| parent | 74c355fbdfedd3820046dba4f537876cea54c207 (diff) | |
| parent | b273fa9716aa1564bee88ceee62f9042981cdc81 (diff) | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'arch/arm/mach-netx/fb.c')
| -rw-r--r-- | arch/arm/mach-netx/fb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c index 5b84bcd30271..b9913234bbf6 100644 --- a/arch/arm/mach-netx/fb.c +++ b/arch/arm/mach-netx/fb.c | |||
| @@ -103,7 +103,6 @@ static struct amba_device fb_device = { | |||
| 103 | .flags = IORESOURCE_MEM, | 103 | .flags = IORESOURCE_MEM, |
| 104 | }, | 104 | }, |
| 105 | .irq = { NETX_IRQ_LCD, NO_IRQ }, | 105 | .irq = { NETX_IRQ_LCD, NO_IRQ }, |
| 106 | .periphid = 0x10112400, | ||
| 107 | }; | 106 | }; |
| 108 | 107 | ||
| 109 | int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) | 108 | int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel) |