diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 19:45:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-10 19:45:17 -0800 |
| commit | c34c15b02e0af7e235f84ca1471747ee1cbb1b87 (patch) | |
| tree | ea6a40c40601e8a1af8c21cd537340179427732d /include | |
| parent | proc: remove/Fix proc generic d_revalidate (diff) | |
| parent | [MIPS] Malta: Enable tickless and highres timers. (diff) | |
| download | linux-dev-c34c15b02e0af7e235f84ca1471747ee1cbb1b87.tar.xz linux-dev-c34c15b02e0af7e235f84ca1471747ee1cbb1b87.zip | |
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 @@ #define NUM_AU1100_MMC_CONTROLLERS 2 - -#define AU1100_SD_IRQ 2 +#if defined(CONFIG_SOC_AU1100) +#define AU1100_SD_IRQ AU1100_SD_INT +#elif defined(CONFIG_SOC_AU1200) +#define AU1100_SD_IRQ AU1200_SD_INT +#endif #define SD0_BASE 0xB0600000 |