summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-04-04 19:27:23 +0200
committerFrans Meulenbroeks <fransmeulenbroeks@gmail.com>2009-04-04 19:27:23 +0200
commitd4880eacd8eb57567844e43ea51a927784359ff3 (patch)
tree78b7ddee6b4e358ba582f3bc9b0e0e7d329f5bd9
parentb5346026a5b351de5ba2d25bbd8c536af46eccec (diff)
linux-omap_2.6.28: added NFSD as module in beagleboard/defconfig
-rw-r--r--recipes/linux/linux-omap-2.6.28/beagleboard/defconfig10
-rw-r--r--recipes/linux/linux-omap_2.6.28.bb2
2 files changed, 9 insertions, 3 deletions
diff --git a/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig
index 7941542b4e..2c95d76309 100644
--- a/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.28/beagleboard/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.28-omap1
-# Tue Mar 24 16:56:43 2009
+# Sat Apr 4 17:44:18 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1930,9 +1930,15 @@ CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
-# CONFIG_NFSD is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_ACL_SUPPORT=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb
index d14472021e..c7b217a23d 100644
--- a/recipes/linux/linux-omap_2.6.28.bb
+++ b/recipes/linux/linux-omap_2.6.28.bb
@@ -13,7 +13,7 @@ DEFAULT_PREFERENCE_omap5912osk = "1"
SRCREV = "79d042a081d3e467c735bb0d9569ed6296f85a3c"
PV = "2.6.28"
-PR = "r18"
+PR = "r19"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;branch=omap-2.6.28;protocol=git \
file://defconfig"