From 00cbcae17ce909f3a160bd2ba1958d5650054b53 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 24 Mar 2011 16:11:35 +0100 Subject: [PATCH] --- yaml --- r: 252359 b: refs/heads/master c: 5de5a4dd872b2ca9fe8be380be5c1a78ce83b88c h: refs/heads/master i: 252357: 79ee08c435c72cdc9e75c8ecfdd88445c5616a97 252355: 62cf6ab89263c1d5c46d6a2a89594d65b3ff5360 252351: 164657cc162eaa22df49a414509ee6410a8bf196 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-netx/fb.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b9c1997962f..d47692be6c8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2846d84ffa4408c9810fabad74cb7aec410352fc +refs/heads/master: 5de5a4dd872b2ca9fe8be380be5c1a78ce83b88c diff --git a/trunk/arch/arm/mach-netx/fb.c b/trunk/arch/arm/mach-netx/fb.c index 5b84bcd30271..b9913234bbf6 100644 --- a/trunk/arch/arm/mach-netx/fb.c +++ b/trunk/arch/arm/mach-netx/fb.c @@ -103,7 +103,6 @@ static struct amba_device fb_device = { .flags = IORESOURCE_MEM, }, .irq = { NETX_IRQ_LCD, NO_IRQ }, - .periphid = 0x10112400, }; int netx_fb_init(struct clcd_board *board, struct clcd_panel *panel)