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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
at91sam9263.h
diff --git
a/arch/arm/mach-at91/include/mach/at91sam9263.h
b/arch/arm/mach-at91/include/mach/at91sam9263.h
index
e2d3482
..
f1b9296
100644
(file)
--- a/
arch/arm/mach-at91/include/mach/at91sam9263.h
+++ b/
arch/arm/mach-at91/include/mach/at91sam9263.h
@@
-70,7
+70,6
@@
#define AT91SAM9263_BASE_EMAC 0xfffbc000
#define AT91SAM9263_BASE_ISI 0xfffc4000
#define AT91SAM9263_BASE_2DGE 0xfffc8000
#define AT91SAM9263_BASE_EMAC 0xfffbc000
#define AT91SAM9263_BASE_ISI 0xfffc4000
#define AT91SAM9263_BASE_2DGE 0xfffc8000
-#define AT91_BASE_SYS 0xffffe000
/*
* System Peripherals (offset from AT91_BASE_SYS)
/*
* System Peripherals (offset from AT91_BASE_SYS)