aboutsummaryrefslogtreecommitdiff
path: root/arch/blackfin/configs/CM-BF537U_defconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-17 12:25:43 +0200
commit0f1f6dec9593c8319714c927dafb443548a1452a (patch)
tree74f887dc86747523e82f08900501073f451996cc /arch/blackfin/configs/CM-BF537U_defconfig
parent8cd162ce230b154e564a1285bb5f89fcf73f0dce (diff)
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/blackfin/configs/CM-BF537U_defconfig')
-rw-r--r--arch/blackfin/configs/CM-BF537U_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig
index 9873d586fc7..f074bdcd1ce 100644
--- a/arch/blackfin/configs/CM-BF537U_defconfig
+++ b/arch/blackfin/configs/CM-BF537U_defconfig
@@ -683,7 +683,7 @@ CONFIG_HWMON=y
#
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB_CORE is not set
-CONFIG_DAB=y
+# CONFIG_DAB is not set
#
# Graphics support