diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-04 11:00:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-04 11:00:42 +0200 |
| commit | d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84 (patch) | |
| tree | f7433f38cd407a0c35a8cbf2b7e3fd756087bce7 /arch/blackfin/mach-bf537/include/mach/blackfin.h | |
| parent | feaa0457ec8351cae855edc9a3052ac49322538e (diff) | |
| parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) | |
| download | blackbird-obmc-linux-d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84.tar.gz blackbird-obmc-linux-d7e57676e3ed7ab9b2c7c4bcb7873e51eacbdb84.zip | |
Merge branch 'linus' into x86/cleanups
Merge reason: We were on an older pre-rc1 base, move to almost-rc2.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-bf537/include/mach/blackfin.h')
| -rw-r--r-- | arch/blackfin/mach-bf537/include/mach/blackfin.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf537/include/mach/blackfin.h b/arch/blackfin/mach-bf537/include/mach/blackfin.h index 7d6069c886f1..f5e5015ad831 100644 --- a/arch/blackfin/mach-bf537/include/mach/blackfin.h +++ b/arch/blackfin/mach-bf537/include/mach/blackfin.h @@ -35,7 +35,6 @@ #define BF537_FAMILY #include "bf537.h" -#include "mem_map.h" #include "defBF534.h" #include "anomaly.h" |
