Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / atmel-mci.h

diff --git a/include/linux/atmel-mci.h b/include/linux/atmel-mci.h
index 3e09b345f4d675ffddcab95e6d6b72039d141237..4c7a4b2104bfc6b105f5258763fda8f0fa6685df 100644 (file)
--- a/include/linux/atmel-mci.h
+++ b/include/linux/atmel-mci.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_ATMEL_MCI_H
 #define __LINUX_ATMEL_MCI_H
 
-#define ATMEL_MCI_MAX_NR_SLOTS 2
+#define ATMCI_MAX_NR_SLOTS     2
 
 /**
  * struct mci_slot_pdata - board-specific per-slot configuration
@@ -33,7 +33,7 @@ struct mci_slot_pdata {
  */
 struct mci_platform_data {
        struct mci_dma_data     *dma_slave;
-       struct mci_slot_pdata   slot[ATMEL_MCI_MAX_NR_SLOTS];
+       struct mci_slot_pdata   slot[ATMCI_MAX_NR_SLOTS];
 };
 
 #endif /* __LINUX_ATMEL_MCI_H */