diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-30 23:57:05 -0500 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-blackfin/mach-bf537/defBF537.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-blackfin/mach-bf537/defBF537.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf537/defBF537.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-blackfin/mach-bf537/defBF537.h b/include/asm-blackfin/mach-bf537/defBF537.h index 26f9c02eb73c..3f455909c418 100644 --- a/include/asm-blackfin/mach-bf537/defBF537.h +++ b/include/asm-blackfin/mach-bf537/defBF537.h @@ -32,12 +32,12 @@ #ifndef _DEF_BF537_H #define _DEF_BF537_H -/*include all Core registers and bit definitions*/ -#include "defBF537.h" - -/*include core specific register pointer definitions*/ +/* Include all Core registers and bit definitions*/ #include <asm/mach-common/cdef_LPBlackfin.h> +/* Include all MMR and bit defines common to BF534 */ +#include "defBF534.h" + /************************************************************************************ ** Define EMAC Section Unique to BF536/BF537 *************************************************************************************/ |