Hi Sascha, I've seen that you have already applied commit "at91sam9m10g45ek: add mci0 support" (dfa3d6613cc21b2b1787c2633b929f58a62fd14f) in your next-branch. Please pull also the other atmel-mci changes. Otherwise the above mentioned commit is useless for it's own. I've prepared a new tree for you, so that you don't run into conflicts. Best regards Hubert The following changes since commit 21536365bb0326f1962bb3da310cec7033fa9d0c: update: add xload (2011-06-11 10:53:04 +0200) are available in the git repository at: git://gitorious.org/hfe-repos/barebox.git atmel-mci-support-3 Hubert Feurstein (2): mci: add Atmel AT91 MCI driver at91sam9m10g45ek: update mci0 support Jean-Christophe PLAGNIOL-VILLARD (1): at91sam9263ek: add mci1 support arch/arm/boards/at91sam9263ek/init.c | 16 + arch/arm/boards/at91sam9m10g45ek/init.c | 14 +- arch/arm/configs/at91sam9263ek_defconfig | 5 + arch/arm/mach-at91/at91sam9260_devices.c | 50 +++ arch/arm/mach-at91/at91sam9261_devices.c | 50 +++ arch/arm/mach-at91/at91sam9263_devices.c | 78 +++++ arch/arm/mach-at91/at91sam9g45_devices.c | 91 ++++++ arch/arm/mach-at91/include/mach/board.h | 10 + drivers/mci/Kconfig | 7 + drivers/mci/Makefile | 1 + drivers/mci/at91_mci.h | 121 ++++++++ drivers/mci/atmel_mci.c | 494 ++++++++++++++++++++++++++++++ 12 files changed, 935 insertions(+), 2 deletions(-) create mode 100644 drivers/mci/at91_mci.h create mode 100644 drivers/mci/atmel_mci.c _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox