[oe] [STABLE][PATCH] omap3 sgx modules: merge in fixes from .dev

[Denys Dmytriyenko]

On Fri, Oct 30, 2009 at 03:40:50PM +0100, Koen Kooi wrote:
> From: Koen Kooi <k-kooi at ti.com>
> 
> Signed-off-by: Koen Kooi <k-kooi at ti.com>
> Signed-off-by: Koen Kooi <koen at openembedded.org>

I'm seeing double here... :)

Acked-by: Denys Dmytriyenko <denis at denix.org>

> ---
>  .../omap3-sgx-modules/proc-interface.patch         |   18 ++++++++++--------
>  .../omap3-sgx-modules_1.3.13.1607.bb               |    8 +++-----
>  2 files changed, 13 insertions(+), 13 deletions(-)
>  mode change 100644 => 100755 recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
> 
> diff --git a/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch b/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
> old mode 100644
> new mode 100755
> index 831b3ed..185191f
> --- a/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
> +++ b/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
> @@ -1,20 +1,22 @@
> -Index: omap3-sgx-modules-1.3.13.1607/services4/srvkm/env/linux/proc.c
> -===================================================================
> ---- omap3-sgx-modules-1.3.13.1607.orig/services4/srvkm/env/linux/proc.c
> -+++ omap3-sgx-modules-1.3.13.1607/services4/srvkm/env/linux/proc.c
> -@@ -134,7 +134,6 @@ int CreateProcEntry(const char * name, r
> +--- ./services4/srvkm/env/linux/proc.c.orig	2009-10-09 13:46:40.000000000 -0500
> ++++ ./services4/srvkm/env/linux/proc.c	2009-10-09 13:48:36.000000000 -0500
> +@@ -134,7 +134,9 @@
>   
>       if (file)
>       {
> --        file->owner = THIS_MODULE;
> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
> +         file->owner = THIS_MODULE;
> ++#endif
>   		file->read_proc = rhandler;
>   		file->write_proc = whandler;
>   		file->data = data;
> -@@ -165,7 +164,6 @@ int CreateProcReadEntry(const char * nam
> +@@ -165,7 +167,9 @@
>   
>       if (file)
>       {
> --        file->owner = THIS_MODULE;
> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
> +         file->owner = THIS_MODULE;
> ++#endif
>   
>           return 0;
>       }
> diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
> index ea57fd2..9bd77ad 100644
> --- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
> +++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
> @@ -7,15 +7,13 @@ SRC_URI = "file://omap3-sgx-modules-${PV}.tar.bz2 \
>             file://0002-Compile-fixes-for-DSS2.patch;patch=1 \
>             file://rotation-dss2.patch;patch=1 \
>             file://build_es3.x_sgx.patch;patch=1 \
> +           file://proc-interface.patch;patch=1 \
>  "
>  
> -SRC_URI_append_omapzoom2 = " file://proc-interface.patch;patch=1"
> -SRC_URI_append_omap3evm = " file://proc-interface.patch;patch=1"
> -SRC_URI_append_omap3517-evm = " file://proc-interface.patch;patch=1"
> -
> -
>  PVRBUILD = "release"
>  
> +INHIBIT_PACKAGE_STRIP = "1"
> +
>  MAKE_TARGETS = " BUILD=${PVRBUILD}"
>  
>  do_install() {
> -- 
> 1.6.1
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel