git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
include
/
mach
/
u300-regs.h
diff --git
a/arch/arm/mach-u300/include/mach/u300-regs.h
b/arch/arm/mach-u300/include/mach/u300-regs.h
index
56721a0
..
8b85df4
100644
(file)
--- a/
arch/arm/mach-u300/include/mach/u300-regs.h
+++ b/
arch/arm/mach-u300/include/mach/u300-regs.h
@@
-20,11
+20,9
@@
/* NAND Flash CS0 */
#define U300_NAND_CS0_PHYS_BASE 0x80000000
/* NAND Flash CS0 */
#define U300_NAND_CS0_PHYS_BASE 0x80000000
-#define U300_NAND_CS0_VIRT_BASE 0xff040000
/* NFIF */
#define U300_NAND_IF_PHYS_BASE 0x9f800000
/* NFIF */
#define U300_NAND_IF_PHYS_BASE 0x9f800000
-#define U300_NAND_IF_VIRT_BASE 0xff030000
/* AHB Peripherals */
#define U300_AHB_PER_PHYS_BASE 0xa0000000
/* AHB Peripherals */
#define U300_AHB_PER_PHYS_BASE 0xa0000000