Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 177266
b: refs/heads/master
c: 4ed250a
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger committed Dec 15, 2009
1 parent 1126738 commit 3f15db4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5da8a3dc480f0424e7bcb9e41b140b1e70c5fdfb
refs/heads/master: 4ed250a563203efd98db05905839269e145785d5
12 changes: 6 additions & 6 deletions trunk/arch/blackfin/mach-bf548/include/mach/cdefBF547.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
* Licensed under the GPL-2 or later.
*/

#ifndef _CDEF_BF548_H
#define _CDEF_BF548_H
#ifndef _CDEF_BF547_H
#define _CDEF_BF547_H

/* include all Core registers and bit definitions */
#include "defBF548.h"
#include "defBF547.h"

/* include core sbfin_read_()ecific register pointer definitions */
#include <asm/cdef_LPBlackfin.h>

/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */

/* include cdefBF54x_base.h for the set of #defines that are common to all ADSP-BF54x bfin_read_()rocessors */
#include "cdefBF54x_base.h"

/* The following are the #defines needed by ADSP-BF548 that are not in the common header */
/* The following are the #defines needed by ADSP-BF547 that are not in the common header */

/* Timer Registers */

Expand Down Expand Up @@ -805,4 +805,4 @@
#define bfin_read_HMDMA1_BCOUNT() bfin_read16(HMDMA1_BCOUNT)
#define bfin_write_HMDMA1_BCOUNT(val) bfin_write16(HMDMA1_BCOUNT, val)

#endif /* _CDEF_BF548_H */
#endif /* _CDEF_BF547_H */
10 changes: 5 additions & 5 deletions trunk/arch/blackfin/mach-bf548/include/mach/defBF547.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
* Licensed under the ADI BSD license or the GPL-2 (or later)
*/

#ifndef _DEF_BF548_H
#define _DEF_BF548_H
#ifndef _DEF_BF547_H
#define _DEF_BF547_H

/* Include all Core registers and bit definitions */
#include <asm/def_LPBlackfin.h>

/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF548 */
/* SYSTEM & MMR ADDRESS DEFINITIONS FOR ADSP-BF547 */

/* Include defBF54x_base.h for the set of #defines that are common to all ADSP-BF54x processors */
#include "defBF54x_base.h"

/* The following are the #defines needed by ADSP-BF548 that are not in the common header */
/* The following are the #defines needed by ADSP-BF547 that are not in the common header */

/* Timer Registers */

Expand Down Expand Up @@ -1217,4 +1217,4 @@
/* ******************************************* */


#endif /* _DEF_BF548_H */
#endif /* _DEF_BF547_H */

0 comments on commit 3f15db4

Please sign in to comment.