diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 17:17:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 17:17:12 -0400 |
| commit | 4aabab2181f20560948c2045ce1faaa9ac1507a8 (patch) | |
| tree | 6556e126687c9cbb4b4a35a8ad8c327df30ac256 /drivers/mmc | |
| parent | bb50cbbd4beacd5ceda76c32fcb116c67fe8c66c (diff) | |
| parent | ca9ced7f6798868f9d2c81a59b49f8c2136685d8 (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (50 commits)
[ARM] sa1100: remove boot time RTC initialisation
[ARM] sa1100: stop doing our own rtc management over suspend
[ARM] 4474/1: Do not check the PSR_F_BIT in valid_user_regs
[ARM] 4473/2: Take the HWCAP definitions out of the elf.h file
[ARM] pxa: move platform devices to separate header file
[ARM] pxa: move device registration into CPU-specific file
[ARM] pxa: remove boot time RTC initialisation
[ARM] pxa: stop doing our own rtc management over suspend
[ARM] 4451/1: pxa: make dma.c generic and remove cpu specific dma code
[ARM] 4450/1: pxa: add pxa25x_init_irq() and pxa27x_init_irq()
[ARM] 4440/1: PXA: enable the checking of ICIP2 for IRQs
[ARM] 4438/1: PXA: remove #ifdef .. #endif from pxa_gpio_demux_handler()
[ARM] 4437/1: PXA: move the GPIO IRQ initialization code to pxa_init_irq_gpio()
[ARM] 4436/1: PXA: move low IRQ initialization code to pxa_init_irq_low()
[ARM] 4435/1: PXA: remove PXA_INTERNAL_IRQS
[ARM] 4434/1: PXA: remove PXA_IRQ_SKIP
[ARM] pxa: Fix PXA27x suspend type validation, remove pxa_pm_prepare()
[ARM] pxa: move pm_ops structure into CPU specific files
[ARM] pxa: introduce cpu_is_pxaXXX macros
[ARM] pxa: remove MMC register defines from pxa-regs.h
...
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/pxamci.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/mmc/host/pxamci.h b/drivers/mmc/host/pxamci.h index 1b163220df2b..df17c281278a 100644 --- a/drivers/mmc/host/pxamci.h +++ b/drivers/mmc/host/pxamci.h | |||
| @@ -1,25 +1,3 @@ | |||
| 1 | #undef MMC_STRPCL | ||
| 2 | #undef MMC_STAT | ||
| 3 | #undef MMC_CLKRT | ||
| 4 | #undef MMC_SPI | ||
| 5 | #undef MMC_CMDAT | ||
| 6 | #undef MMC_RESTO | ||
| 7 | #undef MMC_RDTO | ||
| 8 | #undef MMC_BLKLEN | ||
| 9 | #undef MMC_NOB | ||
| 10 | #undef MMC_PRTBUF | ||
| 11 | #undef MMC_I_MASK | ||
| 12 | #undef END_CMD_RES | ||
| 13 | #undef PRG_DONE | ||
| 14 | #undef DATA_TRAN_DONE | ||
| 15 | #undef MMC_I_REG | ||
| 16 | #undef MMC_CMD | ||
| 17 | #undef MMC_ARGH | ||
| 18 | #undef MMC_ARGL | ||
| 19 | #undef MMC_RES | ||
| 20 | #undef MMC_RXFIFO | ||
| 21 | #undef MMC_TXFIFO | ||
| 22 | |||
| 23 | #define MMC_STRPCL 0x0000 | 1 | #define MMC_STRPCL 0x0000 |
| 24 | #define STOP_CLOCK (1 << 0) | 2 | #define STOP_CLOCK (1 << 0) |
| 25 | #define START_CLOCK (2 << 0) | 3 | #define START_CLOCK (2 << 0) |