diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 22:45:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 22:45:17 -0500 |
| commit | c34c15b02e0af7e235f84ca1471747ee1cbb1b87 (patch) | |
| tree | ea6a40c40601e8a1af8c21cd537340179427732d /include | |
| parent | 3790ee4bd86396558eedd86faac1052cb782e4e1 (diff) | |
| parent | ba0f00b9fcb02b10cc9929fec660f86d1af6a41a (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Malta: Enable tickless and highres timers.
[MIPS] Bigsur: Enable tickless and and highres timers.
qemu: do not enable IP7 blindly
[MIPS] Alchemy: Fix Au1x SD controller IRQ
[MIPS] Don't byteswap writes to display when running bigendian
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1100_mmc.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/asm-mips/mach-au1x00/au1100_mmc.h b/include/asm-mips/mach-au1x00/au1100_mmc.h index 9e7d1ba21b55..9e0028f60a43 100644 --- a/include/asm-mips/mach-au1x00/au1100_mmc.h +++ b/include/asm-mips/mach-au1x00/au1100_mmc.h | |||
| @@ -41,8 +41,11 @@ | |||
| 41 | 41 | ||
| 42 | #define NUM_AU1100_MMC_CONTROLLERS 2 | 42 | #define NUM_AU1100_MMC_CONTROLLERS 2 |
| 43 | 43 | ||
| 44 | 44 | #if defined(CONFIG_SOC_AU1100) | |
| 45 | #define AU1100_SD_IRQ 2 | 45 | #define AU1100_SD_IRQ AU1100_SD_INT |
| 46 | #elif defined(CONFIG_SOC_AU1200) | ||
| 47 | #define AU1100_SD_IRQ AU1200_SD_INT | ||
| 48 | #endif | ||
| 46 | 49 | ||
| 47 | 50 | ||
| 48 | #define SD0_BASE 0xB0600000 | 51 | #define SD0_BASE 0xB0600000 |