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-bf527/include/mach/cdefBF525.h | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
Diffstat (limited to 'arch/blackfin/mach-bf527/include/mach/cdefBF525.h')
| -rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index d7e2751c6bcc..d90a85b6b6b9 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |||
| @@ -1,15 +1,12 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright 2007-2008 Analog Devices Inc. | 2 | * Copyright 2007-2010 Analog Devices Inc. |
| 3 | * | 3 | * |
| 4 | * Licensed under the GPL-2 or later | 4 | * Licensed under the GPL-2 or later. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #ifndef _CDEF_BF525_H | 7 | #ifndef _CDEF_BF525_H |
| 8 | #define _CDEF_BF525_H | 8 | #define _CDEF_BF525_H |
| 9 | 9 | ||
| 10 | /* include all Core registers and bit definitions */ | ||
| 11 | #include "defBF525.h" | ||
| 12 | |||
| 13 | /* BF525 is BF522 + USB */ | 10 | /* BF525 is BF522 + USB */ |
| 14 | #include "cdefBF522.h" | 11 | #include "cdefBF522.h" |
| 15 | 12 | ||