diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 19:51:07 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 19:51:07 +0000 |
| commit | f455dfb106916d855d59686fe16575c2ceb2cb2a (patch) | |
| tree | de705fc7037b03c75490871c4a4ce1ab659a7c7a | |
| 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>
| -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 8ca7d7f09bd..568daea93fb 100644 --- a/arch/arm/mach-shark/include/mach/io.h +++ b/arch/arm/mach-shark/include/mach/io.h @@ -15,6 +15,7 @@ #define IO_SPACE_LIMIT 0xffffffff #define __io(a) __typesafe_io(PCIO_BASE + (a)) + #define __mem_pci(addr) (addr) #endif |