diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 15:51:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 15:51:07 -0400 |
| commit | f455dfb106916d855d59686fe16575c2ceb2cb2a (patch) | |
| tree | de705fc7037b03c75490871c4a4ce1ab659a7c7a /arch/arm | |
| parent | cbf1146d5ee113152c5cdeb54ff9d4b2f0c91736 (diff) | |
ASoC: Fix up merge with the ARM tree
The same change has been made with the final lines in slightly differnet
orders.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shark/include/mach/io.h b/arch/arm/mach-shark/include/mach/io.h index 8ca7d7f09bdc..568daea93fb1 100644 --- a/arch/arm/mach-shark/include/mach/io.h +++ b/arch/arm/mach-shark/include/mach/io.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #define IO_SPACE_LIMIT 0xffffffff | 15 | #define IO_SPACE_LIMIT 0xffffffff |
| 16 | 16 | ||
| 17 | #define __io(a) __typesafe_io(PCIO_BASE + (a)) | 17 | #define __io(a) __typesafe_io(PCIO_BASE + (a)) |
| 18 | |||
| 18 | #define __mem_pci(addr) (addr) | 19 | #define __mem_pci(addr) (addr) |
| 19 | 20 | ||
| 20 | #endif | 21 | #endif |