From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Sun, 12 Oct 2008 13:44:33 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen... 
X-Git-Tag: v2.6.28-rc1~22^2~10
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0d62950125241a6e6db8e8f14271f098ec7a2da4;p=linux-2.6-block.git

Merge branch 'master' of git://git./linux/kernel/git/hskinnemoen/atmel-mci-2.6.28
---

0d62950125241a6e6db8e8f14271f098ec7a2da4
diff --cc arch/avr32/boards/atstk1000/atstk1004.c
index 2c072cd0c22e,d6a2d02f0329..949c13ec51ed
--- a/arch/avr32/boards/atstk1000/atstk1004.c
+++ b/arch/avr32/boards/atstk1000/atstk1004.c
@@@ -137,11 -147,10 +147,11 @@@ 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, NULL);
+ 	at32_add_device_mci(0, &mci0_data);
  #endif
  	at32_add_device_lcdc(0, &atstk1000_lcdc_data,
 -			     fbmem_start, fbmem_size, 0);
 +			     fbmem_start, fbmem_size,
 +			     ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL);
  	at32_add_device_usba(0, NULL);
  #ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM
  	at32_add_device_ssc(0, ATMEL_SSC_TX);