From: trickie@gmail.com <trickie@gmail.com>
Date: Sat, 24 May 2008 20:20:44 +0000 (+0200)
Subject: Remove config conditional tcm825x_regs_* declarations
X-Git-Tag: v2.6.26-omap1~123^2~57
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6ca4ec80c30313a76bc503c14450485aaf6d50ec;p=linux-2.6-omap-h63xx.git

Remove config conditional tcm825x_regs_* declarations

Signed-off-by: Nick Loeve <trickie@gmail.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index b5251253651..f2bf91c7e41 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)
 {