2008-07-17 13:45:36

by Adrian Bunk

Subject: [2.6 patch] fix avr32 build errors

Commit 7d2be0749a59096a334c94dc48f43294193cb8ed
(atmel-mci: Driver for Atmel on-chip MMC controllers)
causes build errors like:

<-- snip -->

...
CC arch/avr32/boards/atstk1000/atstk1003.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/avr32/boards/atstk1000/atstk1003.c: In function 'atstk1003_init':
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/avr32/boards/atstk1000/atstk1003.c:157: error: too few arguments to function 'at32_add_device_mci'
make[2]: *** [arch/avr32/boards/atstk1000/atstk1003.o] Error 1

<-- snip -->

Reported-by: Adrian Bunk <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>

---

arch/avr32/boards/atstk1000/atstk1003.c | 2 +-
arch/avr32/boards/atstk1000/atstk1004.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

fb234419ed2174f7cf658da91ee385891ad7b3eb
diff --git a/arch/avr32/boards/atstk1000/atstk1003.c b/arch/avr32/boards/atstk1000/atstk1003.c
index ea109f4..591fc73 100644
--- a/arch/avr32/boards/atstk1000/atstk1003.c
+++ b/arch/avr32/boards/atstk1000/atstk1003.c
@@ -154,7 +154,7 @@ static int __init atstk1003_init(void)
at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
#endif
#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
- at32_add_device_mci(0);
+ at32_add_device_mci(0, NULL);
#endif
at32_add_device_usba(0, NULL);
#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
diff --git a/arch/avr32/boards/atstk1000/atstk1004.c b/arch/avr32/boards/atstk1000/atstk1004.c
index c7236df..d9c5e0a 100644
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@ -137,7 +137,7 @@ static int __init atstk1004_init(void)
at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
#endif
#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM
- at32_add_device_mci(0);
+ at32_add_device_mci(0, NULL);
#endif
at32_add_device_lcdc(0, &atstk1000_lcdc_data,
fbmem_start, fbmem_size, 0);

2008-07-17 19:38:15

by Haavard Skinnemoen

Subject: Re: [2.6 patch] fix avr32 build errors

On Thu, 17 Jul 2008 16:45:11 +0300
Adrian Bunk <[email protected]> wrote:

> /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/avr32/boards/atstk1000/atstk1003.c:157: error: too few arguments to function 'at32_add_device_mci'
> make[2]: *** [arch/avr32/boards/atstk1000/atstk1003.o] Error 1
>
> <-- snip -->
>
> Reported-by: Adrian Bunk <[email protected]>
> Signed-off-by: Adrian Bunk <[email protected]>

Applied, thanks a lot. Shame on me for not testing all defconfigs
before submitting.

Haavard