* [PATCH] Remove config conditional tcm825x_regs_* declarations
@ 2008-05-24 20:20 trickie
2008-05-24 22:22 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: trickie @ 2008-05-24 20:20 UTC (permalink / raw)
To: linux-omap; +Cc: Nick Loeve
Signed-off-by: Nick Loeve <trickie@gmail.com>
---
arch/arm/mach-omap2/board-n800-camera.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index b525125..f2bf91c 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)
{
--
1.5.5.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Remove config conditional tcm825x_regs_* declarations
2008-05-24 20:20 [PATCH] Remove config conditional tcm825x_regs_* declarations trickie
@ 2008-05-24 22:22 ` Felipe Balbi
2008-05-28 20:31 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Balbi @ 2008-05-24 22:22 UTC (permalink / raw)
To: trickie; +Cc: linux-omap
On Sat, May 24, 2008 at 10:20:44PM +0200, trickie@gmail.com wrote:
>
> Signed-off-by: Nick Loeve <trickie@gmail.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
> arch/arm/mach-omap2/board-n800-camera.c | 4 ----
> 1 files changed, 0 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
> index b525125..f2bf91c 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)
> {
> --
> 1.5.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Best Regards,
Felipe Balbi
me@felipebalbi.com
http://blog.felipebalbi.com
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Remove config conditional tcm825x_regs_* declarations
2008-05-24 22:22 ` Felipe Balbi
@ 2008-05-28 20:31 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2008-05-28 20:31 UTC (permalink / raw)
To: Felipe Balbi; +Cc: trickie, linux-omap
* Felipe Balbi <me@felipebalbi.com> [080524 15:25]:
> On Sat, May 24, 2008 at 10:20:44PM +0200, trickie@gmail.com wrote:
> >
> > Signed-off-by: Nick Loeve <trickie@gmail.com>
>
> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Pushing today.
Tony
>
> > ---
> > arch/arm/mach-omap2/board-n800-camera.c | 4 ----
> > 1 files changed, 0 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
> > index b525125..f2bf91c 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)
> > {
> > --
> > 1.5.5.1
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> Best Regards,
>
> Felipe Balbi
> me@felipebalbi.com
> http://blog.felipebalbi.com
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-05-28 20:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-24 20:20 [PATCH] Remove config conditional tcm825x_regs_* declarations trickie
2008-05-24 22:22 ` Felipe Balbi
2008-05-28 20:31 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox