projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'u-boot/master' into for-1.3.1
[platform/kernel/u-boot.git]
/
include
/
asm-arm
/
arch-at91rm9200
/
hardware.h
diff --git
a/include/asm-arm/arch-at91rm9200/hardware.h
b/include/asm-arm/arch-at91rm9200/hardware.h
index
8bb0c47
..
b868e38
100644
(file)
--- a/
include/asm-arm/arch-at91rm9200/hardware.h
+++ b/
include/asm-arm/arch-at91rm9200/hardware.h
@@
-24,8
+24,6
@@
#ifndef __ASSEMBLY__
#include "AT91RM9200.h"
-#else
-#include "AT91RM9200_inc.h"
#endif
/* Virtual and Physical base address for system peripherals */