diff options
author | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-03-30 12:10:03 +0200 |
commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/arm/mach-rpc/include/mach/io.h | |
parent | microblaze: Fix stack usage in PAGE_SIZE copy_tofrom_user (diff) | |
parent | Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
download | linux-dev-6a4770e335bd4df0a4577146f76e116ab6e23f40.tar.xz linux-dev-6a4770e335bd4df0a4577146f76e116ab6e23f40.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/arm/mach-rpc/include/mach/io.h')
-rw-r--r-- | arch/arm/mach-rpc/include/mach/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-rpc/include/mach/io.h b/arch/arm/mach-rpc/include/mach/io.h index 695f4ed2e11b..707071a7ea4e 100644 --- a/arch/arm/mach-rpc/include/mach/io.h +++ b/arch/arm/mach-rpc/include/mach/io.h @@ -28,9 +28,4 @@ */ #define __io(a) (PCIO_BASE + ((a) << 2)) -/* - * 1:1 mapping for ioremapped regions. - */ -#define __mem_pci(x) (x) - #endif |