summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/configs/PNAV-10_defconfig
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-08-08 22:10:12 +0200
committerBen Dooks <ben-linux@fluff.org>2008-08-08 22:10:12 +0200
commitaf7a535688a758d15f06a98833e6a143b29af9de (patch)
treebac5ab210bbbbe276f0e44ed84194d7c8bb16aae /arch/blackfin/configs/PNAV-10_defconfig
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff)
parent[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB (diff)
downloadlinux-af7a535688a758d15f06a98833e6a143b29af9de.tar.xz
linux-af7a535688a758d15f06a98833e6a143b29af9de.zip
Merge http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into for-rmk
Diffstat (limited to 'arch/blackfin/configs/PNAV-10_defconfig')
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index 87622ad9df47..bffca7de65d4 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -294,7 +294,7 @@ CONFIG_C_AMBEN_ALL=y
CONFIG_BANK_0=0x7BB0
CONFIG_BANK_1=0x33B0
CONFIG_BANK_2=0x33B0
-CONFIG_BANK_3=0x99B3
+CONFIG_BANK_3=0x99B2
#
# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
@@ -1080,7 +1080,7 @@ CONFIG_FS_MBCACHE=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
+# CONFIG_DNOTIFY is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
# CONFIG_FUSE_FS is not set