diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-06 22:53:35 -0400 |
| commit | eeca9fad52fc4bfdf42c38bfcf383e932eb3e9d6 (patch) | |
| tree | cc51c880459d41c0e8d7576405bef4c987bc7aa0 /arch/blackfin/Kconfig | |
| parent | ff6f83fc9d44db09997937c3475d525a6866fbb4 (diff) | |
| parent | b48a97be8e6c2afdba2f3b61fd88c3c7743fbd73 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge upstream tree in order to reinstate crct10dif.
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" |