diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 07:51:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 07:51:29 -0700 |
| commit | a8a44921383039bd5387020d035123d21660b309 (patch) | |
| tree | 762260c85b584f48c74d70f0e1fe03c930c2898e /arch/blackfin/configs/BF561-ACVILON_defconfig | |
| parent | 85eb1513c15652cdaa9fd656345825bf55514a96 (diff) | |
| parent | 92a19d66a3cc17feae20b4c1147e8b4dbf7b2282 (diff) | |
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: bitops: fix include order after little endian inclusion
Blackfin: defconfigs: update after misc devices defaulted to N
Blackfin: use more standard pr_fmt in the module loader
Diffstat (limited to 'arch/blackfin/configs/BF561-ACVILON_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF561-ACVILON_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig index b7c8451f26a..77a27e31d6d 100644 --- a/arch/blackfin/configs/BF561-ACVILON_defconfig +++ b/arch/blackfin/configs/BF561-ACVILON_defconfig @@ -63,7 +63,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=16384 -# CONFIG_MISC_DEVICES is not set CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y |