projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] 3326/1: H1940 - Control latches
[powerpc.git]
/
include
/
asm-arm
/
arch-omap
/
hardware.h
diff --git
a/include/asm-arm/arch-omap/hardware.h
b/include/asm-arm/arch-omap/hardware.h
index
60201e1
..
5406b87
100644
(file)
--- a/
include/asm-arm/arch-omap/hardware.h
+++ b/
include/asm-arm/arch-omap/hardware.h
@@
-267,8
+267,6
@@
#define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00)
#define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04)
#define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00)
#define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04)
-#ifndef __ASSEMBLER__
-
/*
* ---------------------------------------------------------------------------
* Processor specific defines
/*
* ---------------------------------------------------------------------------
* Processor specific defines
@@
-277,13
+275,11
@@
#include "omap730.h"
#include "omap1510.h"
#include "omap730.h"
#include "omap1510.h"
-
-#ifdef CONFIG_ARCH_OMAP24XX
#include "omap24xx.h"
#include "omap24xx.h"
-#endif
-
#include "omap16xx.h"
#include "omap16xx.h"
+#ifndef __ASSEMBLER__
+
/*
* ---------------------------------------------------------------------------
* Board specific defines
/*
* ---------------------------------------------------------------------------
* Board specific defines