diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:04:15 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 14:06:24 -0500 |
| commit | a7790532f5b7358c33a6b1834dc2b318de209f31 (patch) | |
| tree | 0ceb9e24b3f54cb5c8453fb5a218e2a94a0f1cce /arch/blackfin/mach-bf548/include/mach/bf548.h | |
| parent | 2764fb4244cc1bc08df3667924ca4a972e90ac70 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
The SmartMedia FTL code depends on new kfifo bits from 2.6.33
Diffstat (limited to 'arch/blackfin/mach-bf548/include/mach/bf548.h')
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/bf548.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/bf548.h b/arch/blackfin/mach-bf548/include/mach/bf548.h index 7bead5ce0f3b..751e5e11ecf8 100644 --- a/arch/blackfin/mach-bf548/include/mach/bf548.h +++ b/arch/blackfin/mach-bf548/include/mach/bf548.h | |||
| @@ -81,18 +81,6 @@ | |||
| 81 | 81 | ||
| 82 | #define AMGCTLVAL (V_AMBEN | V_AMCKEN) | 82 | #define AMGCTLVAL (V_AMBEN | V_AMCKEN) |
| 83 | 83 | ||
| 84 | #if defined(CONFIG_BF542M) | ||
| 85 | # define CONFIG_BF542 | ||
| 86 | #elif defined(CONFIG_BF544M) | ||
| 87 | # define CONFIG_BF544 | ||
| 88 | #elif defined(CONFIG_BF547M) | ||
| 89 | # define CONFIG_BF547 | ||
| 90 | #elif defined(CONFIG_BF548M) | ||
| 91 | # define CONFIG_BF548 | ||
| 92 | #elif defined(CONFIG_BF549M) | ||
| 93 | # define CONFIG_BF549 | ||
| 94 | #endif | ||
| 95 | |||
| 96 | #if defined(CONFIG_BF542) | 84 | #if defined(CONFIG_BF542) |
| 97 | # define CPU "BF542" | 85 | # define CPU "BF542" |
| 98 | # define CPUID 0x27de | 86 | # define CPUID 0x27de |