summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/arm/kernel.config.sharp-zaurus13
-rw-r--r--target/linux/config/Config.in.misc1
-rw-r--r--target/linux/config/Config.in.multimedia1
3 files changed, 8 insertions, 7 deletions
diff --git a/target/arm/kernel.config.sharp-zaurus b/target/arm/kernel.config.sharp-zaurus
index 41f9bcd6d..65b6f94ad 100644
--- a/target/arm/kernel.config.sharp-zaurus
+++ b/target/arm/kernel.config.sharp-zaurus
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.39 Kernel Configuration
-# Mon Sep 12 18:25:45 2011
+# Fri Sep 30 15:02:47 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -983,7 +983,7 @@ CONFIG_EXT2_FS=y
# CONFIG_NILFS2_FS is not set
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
-# CONFIG_FILE_LOCKING is not set
+CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
# CONFIG_DNOTIFY is not set
CONFIG_INOTIFY_USER=y
@@ -1008,11 +1008,8 @@ CONFIG_GENERIC_ACL=y
#
# DOS/FAT/NT Filesystems
#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_FAT_DEFAULT_CODEPAGE=850
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
# CONFIG_NTFS_FS is not set
#
@@ -1047,6 +1044,8 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index 68f906802..084f19112 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -120,6 +120,7 @@ config ADK_KPACKAGE_KMOD_PPDEV
config ADK_KPACKAGE_KMOD_FW_LOADER
prompt "kmod-fw-loader.................... userspace firmware loading support"
tristate
+ depends on !ADK_TARGET_SYSTEM_SHARP_ZAURUS
default n
help
This may be necessary when using drivers which require
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 92d1997c4..128f42bd3 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -159,6 +159,7 @@ config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS
config ADK_KPACKAGE_KMOD_USB_GSPCA
prompt "kmod-usb-gspca................... GSPCA webcam framework"
+ depends on ADK_TARGET_WITH_USB
tristate
help
GSPCA webcam framework