diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 13:12:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 13:12:58 -0400 |
| commit | 49283f602039e3b81930c4ab5cc20e310b84c7ff (patch) | |
| tree | 92767caa076c66986a4c963592cbb8aedb85f967 /arch/blackfin/Kconfig | |
| parent | 8f041e6ca1901d7dbf017e6db67c264117211b8a (diff) | |
| parent | 150382a53d11256e5666c86525c8bf8d23684532 (diff) | |
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao:
"blackfin updates for Linux 3.11"
* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
smp: refine bf561 smpboot code
bf609: stmmac: fix build after stmmac_mdio_bus_data changed
bf609: add cpu revision 0.1
bf609: rename bfin6xx_spi to bfin_spi3
kgdb: blackfin: include irq_regs.h in kgdb.c
Diffstat (limited to 'arch/blackfin/Kconfig')
| -rw-r--r-- | arch/blackfin/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 08c7ac650405..3b6abc54b015 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
| @@ -283,7 +283,7 @@ config BF_REV_0_0 | |||
| 283 | 283 | ||
| 284 | config BF_REV_0_1 | 284 | config BF_REV_0_1 |
| 285 | bool "0.1" | 285 | bool "0.1" |
| 286 | depends on (BF51x || BF52x || (BF54x && !BF54xM)) | 286 | depends on (BF51x || BF52x || (BF54x && !BF54xM) || BF60x) |
| 287 | 287 | ||
| 288 | config BF_REV_0_2 | 288 | config BF_REV_0_2 |
| 289 | bool "0.2" | 289 | bool "0.2" |