diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-14 11:01:44 +0100 |
| commit | b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc (patch) | |
| tree | c65b81ef9ae5076d2137034accfa2610f45a13de /arch/arm/mach-u300/include/mach/io.h | |
| parent | 06099961002a813324d057a91695af7c72939da6 (diff) | |
| parent | 7666c17e2b0986a079da46122d8658544416c2cf (diff) | |
| download | kernel-crypto-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.gz kernel-crypto-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.tar.xz kernel-crypto-b7c11ec9f1c9f4272f032215ddb0b65d64b22ecc.zip | |
Merge branch 'u300' into devel
Conflicts:
arch/arm/Makefile
Updates:
arch/arm/mach-u300/core.c
arch/arm/mach-u300/timer.c
Diffstat (limited to 'arch/arm/mach-u300/include/mach/io.h')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/io.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/mach-u300/include/mach/io.h b/arch/arm/mach-u300/include/mach/io.h new file mode 100644 index 00000000000..5d6b4c13b3a --- /dev/null +++ b/arch/arm/mach-u300/include/mach/io.h @@ -0,0 +1,20 @@ +/* + * + * arch/arm/mach-u300/include/mach/io.h + * + * + * Copyright (C) 2006-2009 ST-Ericsson AB + * License terms: GNU General Public License (GPL) version 2 + * Dummy IO map for being able to use writew()/readw(), + * writel()/readw() and similar accessor functions. + * Author: Linus Walleij <linus.walleij@stericsson.com> + */ +#ifndef __MACH_IO_H +#define __MACH_IO_H + +#define IO_SPACE_LIMIT 0xffffffff + +#define __io(a) __typesafe_io(a) +#define __mem_pci(a) (a) + +#endif |