git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vfs, fdtable: Prevent bounds-check bypass via speculative execution
[pandora-kernel.git]
/
include
/
linux
/
atmel-mci.h
diff --git
a/include/linux/atmel-mci.h
b/include/linux/atmel-mci.h
index
3e09b34
..
4c7a4b2
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
#ifndef __LINUX_ATMEL_MCI_H
#define __LINUX_ATMEL_MCI_H
-#define ATM
EL_MCI_MAX_NR_SLOTS
2
+#define ATM
CI_MAX_NR_SLOTS
2
/**
* struct mci_slot_pdata - board-specific per-slot configuration
/**
* 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_platform_data {
struct mci_dma_data *dma_slave;
- struct mci_slot_pdata slot[ATM
EL_M
CI_MAX_NR_SLOTS];
+ struct mci_slot_pdata slot[ATMCI_MAX_NR_SLOTS];
};
#endif /* __LINUX_ATMEL_MCI_H */
};
#endif /* __LINUX_ATMEL_MCI_H */