diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:11:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:17:52 -0400 |
| commit | 8a0ca91e1db5de5eb5b18cfa919d52ff8be375af (patch) | |
| tree | bd3a1564940d27ae7f6229089db1283ff2a636c8 /include/asm-mips | |
| parent | 9c1be0c4712fe760d8969427ef91107e9c062d91 (diff) | |
| parent | c43d8636971c39da993e94082fd65bfff421618e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (68 commits)
sdio_uart: Fix SDIO break control to now return success or an error
mmc: host driver for Ricoh Bay1Controllers
sdio: sdio_io.c Fix sparse warnings
sdio: fix the use of hard coded timeout value.
mmc: OLPC: update vdd/powerup quirk comment
mmc: fix spares errors of sdhci.c
mmc: remove multiwrite capability
wbsd: fix bad dma_addr_t conversion
atmel-mci: Driver for Atmel on-chip MMC controllers
mmc: fix sdio_io sparse errors
mmc: wbsd.c fix shadowing of 'dma' variable
MMC: S3C24XX: Refuse incorrectly aligned transfers
MMC: S3C24XX: Add maintainer entry
MMC: S3C24XX: Update error debugging.
MMC: S3C24XX: Add media presence test to request handling.
MMC: S3C24XX: Fix use of msecs where jiffies are needed
MMC: S3C24XX: Add MODULE_ALIAS() entries for the platform devices
MMC: S3C24XX: Fix s3c2410_dma_request() return code check.
MMC: S3C24XX: Allow card-detect on non-IRQ capable pin
MMC: S3C24XX: Ensure host->mrq->data is valid
...
Manually fixed up bogus executable bits on drivers/mmc/core/sdio_io.c
and include/linux/mmc/sdio_func.h when merging.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/mach-au1x00/au1100_mmc.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-mips/mach-au1x00/au1100_mmc.h b/include/asm-mips/mach-au1x00/au1100_mmc.h index 9e0028f60a43..c35e20918490 100644 --- a/include/asm-mips/mach-au1x00/au1100_mmc.h +++ b/include/asm-mips/mach-au1x00/au1100_mmc.h | |||
| @@ -38,15 +38,15 @@ | |||
| 38 | #ifndef __ASM_AU1100_MMC_H | 38 | #ifndef __ASM_AU1100_MMC_H |
| 39 | #define __ASM_AU1100_MMC_H | 39 | #define __ASM_AU1100_MMC_H |
| 40 | 40 | ||
| 41 | 41 | #include <linux/leds.h> | |
| 42 | #define NUM_AU1100_MMC_CONTROLLERS 2 | 42 | |
| 43 | 43 | struct au1xmmc_platform_data { | |
| 44 | #if defined(CONFIG_SOC_AU1100) | 44 | int(*cd_setup)(void *mmc_host, int on); |
| 45 | #define AU1100_SD_IRQ AU1100_SD_INT | 45 | int(*card_inserted)(void *mmc_host); |
| 46 | #elif defined(CONFIG_SOC_AU1200) | 46 | int(*card_readonly)(void *mmc_host); |
| 47 | #define AU1100_SD_IRQ AU1200_SD_INT | 47 | void(*set_power)(void *mmc_host, int state); |
| 48 | #endif | 48 | struct led_classdev *led; |
| 49 | 49 | }; | |
| 50 | 50 | ||
| 51 | #define SD0_BASE 0xB0600000 | 51 | #define SD0_BASE 0xB0600000 |
| 52 | #define SD1_BASE 0xB0680000 | 52 | #define SD1_BASE 0xB0680000 |