diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-04-05 12:51:27 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-05 12:51:27 +0200 |
| commit | 5aef3271b0a319537c9642ad73255f40db195d1b (patch) | |
| tree | 9de9d5fafd17c3c171b2d55bc8f4b83b6496c142 /recipes/linux | |
| parent | e6269bd09d54b6f14bca73d73b9ab4c49c91f56a (diff) | |
| parent | c6f4f96987db54cefb8955982c2e88a8d869e916 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-omap-2.6.28/beagleboard/defconfig | 10 | ||||
| -rw-r--r-- | recipes/linux/linux-omap_2.6.28.bb | 2 |
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 caa362ee6a..bc085c7e06 100644 --- a/recipes/linux/linux-omap_2.6.28.bb +++ b/recipes/linux/linux-omap_2.6.28.bb @@ -12,7 +12,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" |