diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 14:17:48 +0100 |
commit | 15e7f8b92aed71819411025279cd3df37f8c636b (patch) | |
tree | 6bc90fd9fcdd4e58321e3f881b2fbcb108a6a654 /arch/blackfin/mach-bf527/include/mach/cdefBF525.h | |
parent | 21949f00a022e090a7e8bc9a01dfca88273c6146 (diff) | |
parent | ef18beded8ddbaafdf4914bab209f77e60ae3a18 (diff) | |
download | talos-op-linux-15e7f8b92aed71819411025279cd3df37f8c636b.tar.gz talos-op-linux-15e7f8b92aed71819411025279cd3df37f8c636b.zip |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'arch/blackfin/mach-bf527/include/mach/cdefBF525.h')
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h index dc3119e9f663..d7e2751c6bcc 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF525.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF525.h @@ -10,15 +10,8 @@ /* include all Core registers and bit definitions */ #include "defBF525.h" -/* include core specific register pointer definitions */ -#include <asm/cdef_LPBlackfin.h> - -/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF525 */ - -/* include cdefBF52x_base.h for the set of #defines that are common to all ADSP-BF52x processors */ -#include "cdefBF52x_base.h" - -/* The following are the #defines needed by ADSP-BF525 that are not in the common header */ +/* BF525 is BF522 + USB */ +#include "cdefBF522.h" /* USB Control Registers */ |