diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 04:00:30 -0400 |
| commit | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (patch) | |
| tree | 0114637e8be2b38176e7e91e6cea3501b22cb66a /arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |
| parent | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (diff) | |
| parent | b11bdb5254ff17cb63e4ae5088b73fdcd2cc2602 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h index c54b3e56ba63..9ac4d1055097 100644 --- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h +++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | |||
| @@ -105,6 +105,7 @@ | |||
| 105 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) | 105 | #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) |
| 106 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) | 106 | #define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) |
| 107 | 107 | ||
| 108 | #define EP93XX_AAC_PHYS_BASE EP93XX_APB_PHYS(0x00080000) | ||
| 108 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) | 109 | #define EP93XX_AAC_BASE EP93XX_APB_IOMEM(0x00080000) |
| 109 | 110 | ||
| 110 | #define EP93XX_SPI_PHYS_BASE EP93XX_APB_PHYS(0x000a0000) | 111 | #define EP93XX_SPI_PHYS_BASE EP93XX_APB_PHYS(0x000a0000) |