diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-11-17 10:40:30 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-27 15:58:27 -0400 |
| commit | ac0a5042befbe4396b7650358ad35298512d683d (patch) | |
| tree | ed0ce62c139f88153a4f7acd787e3c82d761298c /arch/blackfin/include | |
| parent | d4348c678977c7093438bbbf2067c49396ae941b (diff) | |
Blackfin: punt duplicate SPORT MMR defines
The common bfin_sport.h header now has unified definitions of these, so
stop polluting the global namespace.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/bfin_sport.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/blackfin/include/asm/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h index 9626cf7e4251..d27600c262c2 100644 --- a/arch/blackfin/include/asm/bfin_sport.h +++ b/arch/blackfin/include/asm/bfin_sport.h | |||
| @@ -115,12 +115,6 @@ struct sport_register { | |||
| 115 | 115 | ||
| 116 | #endif | 116 | #endif |
| 117 | 117 | ||
| 118 | /* Workaround defBF*.h SPORT MMRs till they get cleansed */ | ||
| 119 | #undef DTYPE_NORM | ||
| 120 | #undef SLEN | ||
| 121 | #undef SP_WOFF | ||
| 122 | #undef SP_WSIZE | ||
| 123 | |||
| 124 | /* SPORT_TCR1 Masks */ | 118 | /* SPORT_TCR1 Masks */ |
| 125 | #define TSPEN 0x0001 /* TX enable */ | 119 | #define TSPEN 0x0001 /* TX enable */ |
| 126 | #define ITCLK 0x0002 /* Internal TX Clock Select */ | 120 | #define ITCLK 0x0002 /* Internal TX Clock Select */ |