Skip to contentSkip to conversation

Remove config conditional tcm825x_regs_* declarations

PATCH In review [email protected] 3 participants 3 messages May 24, 2008 – May 28, 2008

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 Remove config conditional tcm825x_regs_* declarations

Signed-off-by Nick Loeve <[email protected]>
---
 arch/arm/mach-omap2/board-n800-camera.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-n800-camera.c +0 -4
index b525125..f2bf91c 100644
@@ -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)
 {
Signature · 1 line
1.5.5.1
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · On Sat, May 24, 2008 at 10:20:44PM +0200, [email protected] wrote:
Signed-off-by Nick Loeve <[email protected]>
Acked-by Felipe Balbi <[email protected]>
Quoted 41 lines
---
 arch/arm/mach-omap2/board-n800-camera.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-n800-camera.c +0 -4
index b525125..f2bf91c 100644
@@ -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)
 {
Signature · 6 lines
1.5.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
Best Regards,

Felipe Balbi
[email protected]
http://blog.felipebalbi.com
maintainer
#2 lore raw
Quoted 5 lines · Felipe Balbi
Quoted 2 lines · On Sat, May 24, 2008 at 10:20:44PM +0200, [email protected] wrote:
Signed-off-by Nick Loeve <[email protected]>
Acked-by Felipe Balbi <[email protected]>

Pushing today.

Tony

Quoted 53 lines
Quoted 42 lines
---
 arch/arm/mach-omap2/board-n800-camera.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/arm/mach-omap2/board-n800-camera.c +0 -4
index b525125..f2bf91c 100644
@@ -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)
 {
Signature · 6 lines
1.5.5.1

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 9 lines
Best Regards,

Felipe Balbi
[email protected]
http://blog.felipebalbi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html