On Sat, May 24, 2008 at 08:43:50PM +0200, trickie@xxxxxxxxx wrote: > > Signed-off-by: Nick Loeve <trickie@xxxxxxxxx> > --- > arch/arm/mach-omap2/board-n800-camera.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c > index b525125..63bca1f 100644 > --- a/arch/arm/mach-omap2/board-n800-camera.c > +++ b/arch/arm/mach-omap2/board-n800-camera.c > @@ -221,9 +221,10 @@ static int tcm825x_power_set(int power) > > static const struct tcm825x_reg *tcm825x_default_regs(void) > { > - if (machine_is_nokia_n810()) > +#ifdef CONFIG_MACH_NOKIA_N810 > + if (machine_is_nokia_n810()) > return tcm825x_regs_n810; > - > +#endif > return tcm825x_regs_n800; > } I think the best way would be removing the ifdefs on tcm825x_regs_* Could you try it ? -- 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