diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-26 00:28:22 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-26 13:28:44 +0200 |
commit | c837131336d66a7678abf1e49a316c96d2e66375 (patch) | |
tree | fdc2db97d34b1ac8348634750ae364cc1e037695 /recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch | |
parent | 7e92541764988ffe2ddcd12806372eba2c164e78 (diff) |
linux-openmoko-2.6.34: bump SRCREV, rebase patches
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch')
-rw-r--r-- | recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch new file mode 100644 index 0000000000..3c9b48bc3b --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch @@ -0,0 +1,28 @@ +From 97f5e67992f766359987a876e61afacf3a8532cb Mon Sep 17 00:00:00 2001 +From: Thomas White <taw@bitwiz.org.uk> +Date: Mon, 24 May 2010 21:49:14 +0200 +Subject: [PATCH 8/8] Use unlocked_ioctl rather than ioctl + +The arguments changed between 2.6.32 and 2.6.34. + +Signed-off-by: Thomas White <taw@bitwiz.org.uk> +--- + drivers/gpu/drm/glamo/glamo-drm-drv.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c +index 2a7f600..36e6941 100644 +--- a/drivers/gpu/drm/glamo/glamo-drm-drv.c ++++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c +@@ -180,7 +180,7 @@ static struct drm_driver glamodrm_drm_driver = { + .owner = THIS_MODULE, + .open = drm_open, + .release = drm_release, +- .ioctl = drm_ioctl, ++ .unlocked_ioctl = drm_ioctl, + .mmap = drm_gem_mmap, + .poll = drm_poll, + .fasync = drm_fasync, +-- +1.7.1 + |