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/CM-BF548_defconfig | |
parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | Blackfin: bitops: fix include order after little endian inclusion (diff) | |
download | linux-dev-a8a44921383039bd5387020d035123d21660b309.tar.xz linux-dev-a8a44921383039bd5387020d035123d21660b309.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: 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/CM-BF548_defconfig')
-rw-r--r-- | arch/blackfin/configs/CM-BF548_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig index df267588efec..31d954216c05 100644 --- a/arch/blackfin/configs/CM-BF548_defconfig +++ b/arch/blackfin/configs/CM-BF548_defconfig @@ -63,7 +63,6 @@ CONFIG_MTD_RAM=y CONFIG_MTD_COMPLEX_MAPPINGS=y CONFIG_MTD_PHYSMAP=y CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set CONFIG_SCSI=m CONFIG_BLK_DEV_SD=m # CONFIG_SCSI_LOWLEVEL is not set |