* Felipe Balbi <me@xxxxxxxxxxxxxxx> [080524 15:25]: > On Sat, May 24, 2008 at 10:20:44PM +0200, trickie@xxxxxxxxx wrote: > > > > Signed-off-by: Nick Loeve <trickie@xxxxxxxxx> > > Acked-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> Pushing today. Tony > > > --- > > arch/arm/mach-omap2/board-n800-camera.c | 4 ---- > > 1 files changed, 0 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c > > index b525125..f2bf91c 100644 > > --- a/arch/arm/mach-omap2/board-n800-camera.c > > +++ b/arch/arm/mach-omap2/board-n800-camera.c > > @@ -73,7 +73,6 @@ static int frames_after_reset; > > static int saturated_count; > > #endif > > > > -#ifdef CONFIG_MACH_NOKIA_N800 > > const static struct tcm825x_reg tcm825x_regs_n800[] = { > > /* initial settings for 2.5 V */ > > {0x00, 0x03}, {0x03, 0x29}, {0xaa, 0x2a}, {0xc0, 0x2b}, > > @@ -106,9 +105,7 @@ const static struct tcm825x_reg tcm825x_regs_n800[] = { > > {0x08, 0x5c}, {0x08, 0x5d}, {0x08, 0x5e}, {0x08, 0x5f}, > > {TCM825X_VAL_TERM, TCM825X_REG_TERM} > > }; > > -#endif > > > > -#ifdef CONFIG_MACH_NOKIA_N810 > > const static struct tcm825x_reg tcm825x_regs_n810[] = { > > /* initial settings for 2.5 V */ > > {0x00, 0x03}, {0x03, 0x29}, {0xaa, 0x2a}, {0xc0, 0x2b}, > > @@ -141,7 +138,6 @@ const static struct tcm825x_reg tcm825x_regs_n810[] = { > > {0x08, 0x5c}, {0x08, 0x5d}, {0x08, 0x5e}, {0x08, 0x5f}, > > {TCM825X_VAL_TERM, TCM825X_REG_TERM} > > }; > > -#endif > > > > static int tcm825x_is_okay(void) > > { > > -- > > 1.5.5.1 > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > > the body of a message to majordomo@xxxxxxxxxxxxxxx > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > Best Regards, > > Felipe Balbi > me@xxxxxxxxxxxxxxx > http://blog.felipebalbi.com > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html