Commit f455dfb1 authored by Mark Brown's avatar Mark Brown

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cbf1146d
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#define IO_SPACE_LIMIT 0xffffffff #define IO_SPACE_LIMIT 0xffffffff
#define __io(a) __typesafe_io(PCIO_BASE + (a)) #define __io(a) __typesafe_io(PCIO_BASE + (a))
#define __mem_pci(addr) (addr) #define __mem_pci(addr) (addr)
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment