Skip to content

Commit

Permalink
ASoC: Fix up merge with the ARM tree
Browse files Browse the repository at this point in the history
The same change has been made with the final lines in slightly differnet
orders.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Mark Brown committed Mar 10, 2009
1 parent cbf1146 commit f455dfb
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-shark/include/mach/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#define IO_SPACE_LIMIT 0xffffffff

#define __io(a) __typesafe_io(PCIO_BASE + (a))

#define __mem_pci(addr) (addr)

#endif

0 comments on commit f455dfb

Please sign in to comment.