Fix compile on n800 if CONFIG_MACH_NOKIA_N810 is not set
Subsystems (3)
PATCH 1/1 Fix compile on n800 if CONFIG_MACH_NOKIA_N810 is not set
Signed-off-by Nick Loeve <[email protected]>
--- arch/arm/mach-omap2/board-n800-camera.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-n800-camera.c +3 -2
@@ -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; }
Signature · 1 line
1.5.5.1
Quoted 12 lines · On Sat, May 24, 2008 at 08:43:50PM +0200, [email protected] wrote:
Signed-off-by Nick Loeve <[email protected]>--- arch/arm/mach-omap2/board-n800-camera.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)arch/arm/mach-omap2/board-n800-camera.c +0
-0@@ -221,9 +221,10 @@ static int tcm825x_power_set(int power)
arch/arm/mach-omap2/board-n800-camera.c static int tcm825x_power_set(int power) · line 229
Quoted 10 lines
arch/arm/mach-omap2/board-n800-camera.c +3
-2static 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 ?
Signature · 5 lines
Best Regards, Felipe Balbi [email protected] http://blog.felipebalbi.com
Hi,
Quoted 13 lines · Felipe Balbi
Quoted 12 lines · On Sat, May 24, 2008 at 08:43:50PM +0200, [email protected] wrote:
Signed-off-by Nick Loeve <[email protected]>--- arch/arm/mach-omap2/board-n800-camera.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)arch/arm/mach-omap2/board-n800-camera.c +0
-0@@ -221,9 +221,10 @@ static int tcm825x_power_set(int power)
Quoted 13 lines
arch/arm/mach-omap2/board-n800-camera.c static int tcm825x_power_set(int power) · line 229
Quoted 10 lines
arch/arm/mach-omap2/board-n800-camera.c +3
-2static 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 ?
Yes you are right. Builds and and boots fine on a n800. I will send a new patch.
Quoted 8 lines
--
Best Regards,Felipe Balbi
[email protected]
http://blog.felipebalbi.com
Signature · 1 line
Nick Loeve