diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
| commit | 83eb95b852902f952ba594447a796ad8146b9462 (patch) | |
| tree | 33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /arch/blackfin/mach-bf548/include/mach/defBF547.h | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
Diffstat (limited to 'arch/blackfin/mach-bf548/include/mach/defBF547.h')
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF547.h b/arch/blackfin/mach-bf548/include/mach/defBF547.h index be21ba5b3aa8..2f3337cd311e 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF547.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF547.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright 2008 Analog Devices Inc. | 2 | * Copyright 2008-2010 Analog Devices Inc. |
| 3 | * | 3 | * |
| 4 | * Licensed under the ADI BSD license or the GPL-2 (or later) | 4 | * Licensed under the ADI BSD license or the GPL-2 (or later) |
| 5 | */ | 5 | */ |
| @@ -7,11 +7,6 @@ | |||
| 7 | #ifndef _DEF_BF547_H | 7 | #ifndef _DEF_BF547_H |
| 8 | #define _DEF_BF547_H | 8 | #define _DEF_BF547_H |
| 9 | 9 | ||
| 10 | /* Include all Core registers and bit definitions */ | ||
| 11 | #include <asm/def_LPBlackfin.h> | ||
| 12 | |||
| 13 | /* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */ | ||
| 14 | |||
| 15 | /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */ | 10 | /* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */ |
| 16 | #include "defBF54x_base.h" | 11 | #include "defBF54x_base.h" |
| 17 | 12 | ||