diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 03:41:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-26 03:41:32 +0200 |
| commit | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (patch) | |
| tree | fdf6cd3a851bca2c8c9db2e751abd5eddfcb2f66 /arch/blackfin/configs/TCM-BF518_defconfig | |
| parent | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | Blackfin: fix inverted anomaly 05000481 logic (diff) | |
| download | linux-4833c16dea61cb30d6f77dfec3067a08ba79b361.tar.xz linux-4833c16dea61cb30d6f77dfec3067a08ba79b361.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix inverted anomaly 05000481 logic
Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK
Blackfin: ppi/spi/twi headers: add missing __BFP undef
Blackfin: update defconfigs
Blackfin: bfin_twi.h: start a common TWI header
netdev: bfin_mac: push settings to platform resources
Diffstat (limited to 'arch/blackfin/configs/TCM-BF518_defconfig')
| -rw-r--r-- | arch/blackfin/configs/TCM-BF518_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/configs/TCM-BF518_defconfig b/arch/blackfin/configs/TCM-BF518_defconfig index 412bf79b9724..1bccd9a50986 100644 --- a/arch/blackfin/configs/TCM-BF518_defconfig +++ b/arch/blackfin/configs/TCM-BF518_defconfig @@ -128,7 +128,6 @@ CONFIG_DEBUG_DOUBLEFAULT=y CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE=y CONFIG_EARLY_PRINTK=y CONFIG_CPLB_INFO=y -CONFIG_SECURITY=y CONFIG_CRYPTO=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRC_CCITT=m |