diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-11 12:51:40 -0400 |
commit | 10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1 (patch) | |
tree | eddf856286234f28cac747d20eb59d918e1bc8b5 /include/asm-arm/arch-rpc/memory.h | |
parent | [PATCH] ahci: do not fail softreset if PHY reports no device (diff) | |
parent | [PATCH] __group_complete_signal: remove bogus BUG_ON (diff) | |
download | linux-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.tar.xz linux-dev-10a5fd5e6b7e2d464c9f95f67cade4ddbd63f4e1.zip |
Merge branch 'master'
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
Diffstat (limited to 'include/asm-arm/arch-rpc/memory.h')
-rw-r--r-- | include/asm-arm/arch-rpc/memory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h index 0592cb3f0c74..303c424ce673 100644 --- a/include/asm-arm/arch-rpc/memory.h +++ b/include/asm-arm/arch-rpc/memory.h @@ -30,4 +30,10 @@ #define __virt_to_bus(x) __virt_to_phys(x) #define __bus_to_virt(x) __phys_to_virt(x) +/* + * Cache flushing area - ROM + */ +#define FLUSH_BASE_PHYS 0x00000000 +#define FLUSH_BASE 0xdf000000 + #endif |