2009-11-18 13:23:51

by Pavel Machek

Subject: 2.6.32-rc7: compile regression on spitz

If CONFIG_AKITA is not set, spitz fails to compile. It worked ok in
rc5. Fix is one more ifdef...

Signed-off-by: Pavel Machek <[email protected]>

--- a/arch/arm/mach-pxa/spitz.c 2009-11-17 17:10:21.000000000 +0100
+++ b/arch/arm/mach-pxa/spitz.c 2009-11-18 05:55:21.000000000 +0100
@@ -802,10 +802,12 @@
{
spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;

+#ifdef CONFIG_MACH_BORZOI
if (machine_is_borzoi()) {
sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
}
+#endif

platform_scoop_config = &spitz_pcmcia_config;






--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2009-11-18 14:38:56

by Stanislav Brabec

Subject: Re: 2.6.32-rc7: compile regression on spitz

Pavel Machek wrote:
> If CONFIG_AKITA is not set, spitz fails to compile. It worked ok in
> rc5. Fix is one more ifdef...

That was my mistake in 5e0fa3f.

> Signed-off-by: Pavel Machek <[email protected]>
Acked-by: Stanislav Brabec <[email protected]>

--
Stanislav Brabec
http://www.penguin.cz/~utx

2009-11-22 14:18:48

by Pavel Machek

Subject: Re: 2.6.32-rc7: compile regression on spitz

On Wed 2009-11-18 10:01:00, Pavel Machek wrote:
>
> If CONFIG_AKITA is not set, spitz fails to compile. It worked ok in
> rc5. Fix is one more ifdef...
>
> Signed-off-by: Pavel Machek <[email protected]>

Eric, this being after-rc5 regression... it would be nice to actually
fix it for final...
Pavel

> --- a/arch/arm/mach-pxa/spitz.c 2009-11-17 17:10:21.000000000 +0100
> +++ b/arch/arm/mach-pxa/spitz.c 2009-11-18 05:55:21.000000000 +0100
> @@ -802,10 +802,12 @@
> {
> spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
>
> +#ifdef CONFIG_MACH_BORZOI
> if (machine_is_borzoi()) {
> sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
> sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
> }
> +#endif
>
> platform_scoop_config = &spitz_pcmcia_config;
>
>
>
>
>
>

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2009-11-22 15:40:30

by Eric Miao

Subject: Re: 2.6.32-rc7: compile regression on spitz

2009/11/18 Stanislav Brabec <[email protected]>:
> Pavel Machek wrote:
>> If CONFIG_AKITA is not set, spitz fails to compile. It worked ok in
>> rc5. Fix is one more ifdef...
>
> That was my mistake in 5e0fa3f.
>
>> Signed-off-by: Pavel Machek <[email protected]>
> Acked-by: Stanislav Brabec <[email protected]>
>

Applied to 'fix'.