All of lore.kernel.org
 help / color / mirror / Atom feed
* [STABLE][PATCH] omap3 sgx modules: merge in fixes from .dev
@ 2009-10-30 14:40 Koen Kooi
  2009-10-31  7:24 ` Denys Dmytriyenko
  0 siblings, 1 reply; 2+ messages in thread
From: Koen Kooi @ 2009-10-30 14:40 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Koen Kooi, Koen Kooi

From: Koen Kooi <k-kooi@ti.com>

Signed-off-by: Koen Kooi <k-kooi@ti.com>
Signed-off-by: Koen Kooi <koen@openembedded.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




^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-10-31  7:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-30 14:40 [STABLE][PATCH] omap3 sgx modules: merge in fixes from .dev Koen Kooi
2009-10-31  7:24 ` Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.