Remove config conditional tcm825x_regs_* declarations

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-camera.c

diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index b52512536514bd68125733fb616b771fa6769de7..f2bf91c7e4153ef91b315a9a4f33243013209bf1 100644 (file)
--- 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)
 {