rpms/omnibook-kmod/devel omnibook-kmod-backlight-2.6.34.patch, NONE, 1.1 omnibook-kmod.spec, 1.4, 1.5
Author: rathann
Update of /cvs/free/rpms/omnibook-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9954
Modified Files:
omnibook-kmod.spec
Added Files:
omnibook-kmod-backlight-2.6.34.patch
Log Message:
* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
- fix build with kernel 2.6.34
omnibook-kmod-backlight-2.6.34.patch:
lcd.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE omnibook-kmod-backlight-2.6.34.patch ---
diff -ur omnibook-20090628/lcd.c omnibook-20090628-mod/lcd.c
--- omnibook-20090628/lcd.c 2009-06-28 13:24:21.000000000 +0100
+++ omnibook-20090628-mod/lcd.c 2010-03-27 13:09:16.540833150 +0000
@@ -146,8 +146,14 @@
}
#ifdef CONFIG_OMNIBOOK_BACKLIGHT
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ struct backlight_properties props;
+ memset (&props, 0, sizeof(struct backlight_properties));
+ props.max_brightness = omnibook_max_brightness;
+ omnibook_backlight_device =
+ backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op,
+ &omnibookbl_ops, &props);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device =
backlight_device_register(OMNIBOOK_MODULE_NAME, NULL, (void *)io_op,
&omnibookbl_ops);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
@@ -161,8 +167,9 @@
printk(O_ERR "Unable to register as backlight device.\n");
return -ENODEV;
}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)
+ backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
omnibook_backlight_device->props.max_brightness = omnibook_max_brightness;
backend_byte_read(io_op, (u8*) &omnibook_backlight_device->props.brightness);
#else /* < 2.6.21 */
Index: omnibook-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/omnibook-kmod/devel/omnibook-kmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- omnibook-kmod.spec 9 Jan 2010 11:03:42 -0000 1.4
+++ omnibook-kmod.spec 5 Sep 2010 13:16:29 -0000 1.5
@@ -9,7 +9,7 @@
Name: omnibook-kmod
Version: 2.20090714
-Release: 0.4.svn288%{?dist}
+Release: 0.5.svn288%{?dist}
Summary: Kernel module for HP Omnibook/Pavillon, Toshiba Satellite and Compal
laptops
Group: System Environment/Kernel
@@ -26,6 +26,8 @@
Patch0: %{name}-warnings.patch
# add support for Toshiba Satellite A300D:
http://sourceforge.net/tracker/?func=detail&aid=2841062&group_id=...
Patch1: %{name}-a300d.patch
+# fix compilation with kernel-2.6.34:
http://sourceforge.net/tracker/?func=detail&aid=2978676&group_id=...
+Patch2: %{name}-backlight-2.6.34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# get the proper build-sysbuild package from the repo, which
@@ -56,6 +58,7 @@
pushd omnibook-%{version}
%patch0 -p1 -b .warn
%patch1 -p1 -b .a300d
+%patch2 -p1 -b .bl
popd
for kernel_version in %{?kernel_versions} ; do
@@ -83,6 +86,9 @@
%changelog
+* Sun Sep 05 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.5.svn288
+- fix build with kernel 2.6.34
+
* Sat Jan 09 2010 Dominik Mierzejewski <rpm(a)greysector.net> 2.20090714-0.4.svn288
- build only akmods in rawhide