Date: Sunday, August 17, 2014 @ 00:33:00
Author: lfleischer
Revision: 220121
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
lirc/repos/extra-i686/PKGBUILD
(from rev 220120, lirc/trunk/PKGBUILD)
lirc/repos/extra-i686/irexec.service
(from rev 220120, lirc/trunk/irexec.service)
lirc/repos/extra-i686/lirc-utils.install
(from rev 220120, lirc/trunk/lirc-utils.install)
lirc/repos/extra-i686/lirc.install
(from rev 220120, lirc/trunk/lirc.install)
lirc/repos/extra-i686/lirc.logrotate
(from rev 220120, lirc/trunk/lirc.logrotate)
lirc/repos/extra-i686/lirc.tmpfiles
(from rev 220120, lirc/trunk/lirc.tmpfiles)
lirc/repos/extra-i686/wpc8769l-build-fix.patch
(from rev 220120, lirc/trunk/wpc8769l-build-fix.patch)
lirc/repos/extra-x86_64/PKGBUILD
(from rev 220120, lirc/trunk/PKGBUILD)
lirc/repos/extra-x86_64/irexec.service
(from rev 220120, lirc/trunk/irexec.service)
lirc/repos/extra-x86_64/lirc-utils.install
(from rev 220120, lirc/trunk/lirc-utils.install)
lirc/repos/extra-x86_64/lirc.install
(from rev 220120, lirc/trunk/lirc.install)
lirc/repos/extra-x86_64/lirc.logrotate
(from rev 220120, lirc/trunk/lirc.logrotate)
lirc/repos/extra-x86_64/lirc.tmpfiles
(from rev 220120, lirc/trunk/lirc.tmpfiles)
lirc/repos/extra-x86_64/wpc8769l-build-fix.patch
(from rev 220120, lirc/trunk/wpc8769l-build-fix.patch)
Deleted:
lirc/repos/extra-i686/PKGBUILD
lirc/repos/extra-i686/irexec.service
lirc/repos/extra-i686/lirc-utils.install
lirc/repos/extra-i686/lirc.install
lirc/repos/extra-i686/lirc.logrotate
lirc/repos/extra-i686/lirc.tmpfiles
lirc/repos/extra-i686/wpc8769l-build-fix.patch
lirc/repos/extra-x86_64/PKGBUILD
lirc/repos/extra-x86_64/irexec.service
lirc/repos/extra-x86_64/lirc-utils.install
lirc/repos/extra-x86_64/lirc.install
lirc/repos/extra-x86_64/lirc.logrotate
lirc/repos/extra-x86_64/lirc.tmpfiles
lirc/repos/extra-x86_64/wpc8769l-build-fix.patch
---------------------------------------+
/PKGBUILD | 198 ++++++++++++++++++++++++++++++++
/irexec.service | 22 +++
/lirc-utils.install | 26 ++++
/lirc.install | 28 ++++
/lirc.logrotate | 10 +
/lirc.tmpfiles | 2
/wpc8769l-build-fix.patch | 180 +++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 98 ---------------
extra-i686/irexec.service | 11 -
extra-i686/lirc-utils.install | 13 --
extra-i686/lirc.install | 14 --
extra-i686/lirc.logrotate | 5
extra-i686/lirc.tmpfiles | 1
extra-i686/wpc8769l-build-fix.patch | 90 --------------
extra-x86_64/PKGBUILD | 98 ---------------
extra-x86_64/irexec.service | 11 -
extra-x86_64/lirc-utils.install | 13 --
extra-x86_64/lirc.install | 14 --
extra-x86_64/lirc.logrotate | 5
extra-x86_64/lirc.tmpfiles | 1
extra-x86_64/wpc8769l-build-fix.patch | 90 --------------
21 files changed, 466 insertions(+), 464 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/PKGBUILD 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,98 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal <[email protected]>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.1
-pkgrel=1
-epoch=1
-_extramodules=extramodules-3.16-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/";
-license=('GPL')
-# NOTICE: Don't forget to bump version in depends in package_lirc()!
-makedepends=('help2man' 'linux>=3.16' 'linux<3.17' 'linux-headers>=3.16'
'linux-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2";
- "wpc8769l-build-fix.patch"
- lirc.logrotate
- irexec.service
- lirc.tmpfiles)
-md5sums=('3b78c3cc872d5e2fa78b796c2efd46db'
- '9ec33169b3407f74264062d7679dd269'
- '3deb02604b37811d41816e9b4385fcc3'
- '32df3b9bc859565d6acf5f0e5b747083'
- 'febf25c154a7d36f01159e84f26c2d9a')
-
-prepare() {
- cd "${srcdir}/lirc-${pkgver}"
-
- patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
-
- sed -i '/AC_PATH_XTRA/d' configure.ac
- sed -e 's/@X_CFLAGS@//g' \
- -e 's/@X_LIBS@//g' \
- -e 's/@X_PRE_LIBS@//g' \
- -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-
- libtoolize
- autoreconf
-}
-
-build() {
- cd "${srcdir}/lirc-${pkgver}"
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
- --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/"
\
- --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \
- --sbindir=/usr/bin --with-transmitter
-
- # Remove drivers already in kernel
- sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
- -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
- -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
- -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
- -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
- make
-}
-
-package_lirc() {
- pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'linux>=3.16' 'linux<3.17')
- replaces=('lirc+pctv')
- install=lirc.install
-
- cd "${srcdir}/lirc-${pkgver}/drivers"
-
- make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}"
install
- gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
-
- # set the kernel we've built for inside the install script
- sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/"
"${startdir}/lirc.install"
-}
-
-package_lirc-utils() {
- pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
- optdepends=('python2: pronto2lirc utility')
- options=('strip')
- backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
- install=lirc-utils.install
-
- cd "${srcdir}/lirc-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}"/irexec.service
"${pkgdir}"/usr/lib/systemd/system/irexec.service
- install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
-
- cp -rp remotes "${pkgdir}/usr/share/lirc"
- chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
- # install the logrotate config
- install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-
- # remove built modules
- rm -r "${pkgdir}/usr/lib/modules"
-}
Copied: lirc/repos/extra-i686/PKGBUILD (from rev 220120, lirc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Paul Mattal <[email protected]>
+
+pkgbase=lirc
+pkgname=('lirc' 'lirc-utils')
+_pkgver=0.9.1a
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" ||
pkgver="$_pkgver"
+pkgrel=1
+epoch=1
+_extramodules=extramodules-3.16-ARCH
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/";
+license=('GPL')
+# NOTICE: Don't forget to bump version in depends in package_lirc()!
+makedepends=('help2man' 'linux>=3.16' 'linux<3.17' 'linux-headers>=3.16'
'linux-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
+options=('!makeflags' '!strip')
+source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2";
+ "wpc8769l-build-fix.patch"
+ lirc.logrotate
+ irexec.service
+ lirc.tmpfiles)
+md5sums=('1f1fac162ed309dd50f307e96a292957'
+ '9ec33169b3407f74264062d7679dd269'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '32df3b9bc859565d6acf5f0e5b747083'
+ 'febf25c154a7d36f01159e84f26c2d9a')
+
+prepare() {
+ cd "${srcdir}/lirc-${_pkgver}"
+
+ patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
+
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -e 's/@X_CFLAGS@//g' \
+ -e 's/@X_LIBS@//g' \
+ -e 's/@X_PRE_LIBS@//g' \
+ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+
+ libtoolize
+ autoreconf
+}
+
+build() {
+ cd "${srcdir}/lirc-${_pkgver}"
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
+ --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/"
\
+ --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \
+ --sbindir=/usr/bin --with-transmitter
+
+ # Remove drivers already in kernel
+ sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+ -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+ -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ make
+}
+
+package_lirc() {
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
+ depends=('lirc-utils' 'linux>=3.16' 'linux<3.17')
+ replaces=('lirc+pctv')
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${_pkgver}/drivers"
+
+ make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}"
install
+ gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
+
+ # set the kernel we've built for inside the install script
+ sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/"
"${startdir}/lirc.install"
+}
+
+package_lirc-utils() {
+ pkgdesc="Linux Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip')
+ backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
+ install=lirc-utils.install
+
+ cd "${srcdir}/lirc-${_pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/irexec.service
"${pkgdir}"/usr/lib/systemd/system/irexec.service
+ install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
+
+ cp -rp remotes "${pkgdir}/usr/share/lirc"
+ chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+ # install the logrotate config
+ install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+
+ # remove built modules
+ rm -r "${pkgdir}/usr/lib/modules"
+}
Deleted: extra-i686/irexec.service
===================================================================
--- extra-i686/irexec.service 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/irexec.service 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC command handler
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/irexec --daemon
-
-[Install]
-WantedBy=multi-user.target
-Wants=lircd.service
Copied: lirc/repos/extra-i686/irexec.service (from rev 220120,
lirc/trunk/irexec.service)
===================================================================
--- extra-i686/irexec.service (rev 0)
+++ extra-i686/irexec.service 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC command handler
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/irexec --daemon
+
+[Install]
+WantedBy=multi-user.target
+Wants=lircd.service
Deleted: extra-i686/lirc-utils.install
===================================================================
--- extra-i686/lirc-utils.install 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/lirc-utils.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,13 +0,0 @@
-post_install() {
- systemd-tmpfiles --create lirc.conf
-}
-
-post_upgrade() {
- post_install
-
- if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
- echo ':: lirc.service and lircm.service have been replaced'
- echo ' by the upstream unit files lircd.service and'
- echo ' lircmd.service.'
- fi
-}
Copied: lirc/repos/extra-i686/lirc-utils.install (from rev 220120,
lirc/trunk/lirc-utils.install)
===================================================================
--- extra-i686/lirc-utils.install (rev 0)
+++ extra-i686/lirc-utils.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,13 @@
+post_install() {
+ systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+ post_install
+
+ if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
+ echo ':: lirc.service and lircm.service have been replaced'
+ echo ' by the upstream unit files lircd.service and'
+ echo ' lircmd.service.'
+ fi
+}
Deleted: extra-i686/lirc.install
===================================================================
--- extra-i686/lirc.install 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/lirc.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,14 +0,0 @@
-EXTRAMODULES=extramodules-3.12-ARCH
-
-post_install() {
- echo ">>> Updating module dependencies. Please wait ..."
- depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: lirc/repos/extra-i686/lirc.install (from rev 220120,
lirc/trunk/lirc.install)
===================================================================
--- extra-i686/lirc.install (rev 0)
+++ extra-i686/lirc.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,14 @@
+EXTRAMODULES=extramodules-3.12-ARCH
+
+post_install() {
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/lirc.logrotate
===================================================================
--- extra-i686/lirc.logrotate 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/lirc.logrotate 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,5 +0,0 @@
-/var/log/lircd {
- missingok
- notifempty
- delaycompress
-}
Copied: lirc/repos/extra-i686/lirc.logrotate (from rev 220120,
lirc/trunk/lirc.logrotate)
===================================================================
--- extra-i686/lirc.logrotate (rev 0)
+++ extra-i686/lirc.logrotate 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
Deleted: extra-i686/lirc.tmpfiles
===================================================================
--- extra-i686/lirc.tmpfiles 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/lirc.tmpfiles 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -
Copied: lirc/repos/extra-i686/lirc.tmpfiles (from rev 220120,
lirc/trunk/lirc.tmpfiles)
===================================================================
--- extra-i686/lirc.tmpfiles (rev 0)
+++ extra-i686/lirc.tmpfiles 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
Deleted: extra-i686/wpc8769l-build-fix.patch
===================================================================
--- extra-i686/wpc8769l-build-fix.patch 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-i686/wpc8769l-build-fix.patch 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,90 +0,0 @@
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index 790efa2..4248fe9 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -51,17 +51,13 @@
- #include <linux/irq.h>
-
- #include <linux/acpi.h>
-+#include <linux/types.h>
-
- #include <linux/platform_device.h>
-+#include <asm-generic/bitops/find.h>
-
--#include "drivers/kcompat.h"
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
--#include <media/lirc.h>
--#include <media/lirc_dev.h>
--#else
--#include "drivers/lirc.h"
--#include "drivers/lirc_dev/lirc_dev.h"
--#endif
-+#include "media/lirc_dev.h"
-+#include "media/lirc.h"
-
- #include "lirc_wpc8769l.h"
-
-@@ -105,11 +101,11 @@ static unsigned int baseport2;
- static unsigned int irq;
-
- /* Debugging flag. */
--static int debug;
-+static bool debug;
-
- /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and
- * IRQ. */
--static int skip_probe;
-+static bool skip_probe;
-
- /* Whether the device is open or not. */
- static int lirc_wpc8769l_is_open;
-@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
- size = count << 3;
-
- ldata = (unsigned long *) data_buf;
-- next_one = generic_find_next_le_bit(ldata, size, 0);
-+ next_one = find_next_bit(ldata, size, 0);
-
- if (next_one > 0)
- put_pulse_bit(next_one
- * WPC8769L_USECS_PER_BIT);
-
- while (next_one < size) {
-- next_zero = generic_find_next_zero_le_bit(ldata,
-+ next_zero = find_next_zero_bit(ldata,
- size, next_one + 1);
-
- put_space_bit(
-@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
- * WPC8769L_USECS_PER_BIT);
-
- if (next_zero < size) {
-- next_one = generic_find_next_le_bit(ldata,
-+ next_one = find_next_bit(ldata,
- size, next_zero + 1);
-
- put_pulse_bit(
-@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void)
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
-
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev)
- {
- return 0;
- }
-
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev)
- {
- return 0;
- }
-@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device
*dev)
-
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- .probe = lirc_wpc8769l_probe,
-- .remove = __devexit_p(lirc_wpc8769l_remove),
-+ .remove = lirc_wpc8769l_remove,
- .suspend = lirc_wpc8769l_suspend,
- .resume = lirc_wpc8769l_resume,
- .driver = {
Copied: lirc/repos/extra-i686/wpc8769l-build-fix.patch (from rev 220120,
lirc/trunk/wpc8769l-build-fix.patch)
===================================================================
--- extra-i686/wpc8769l-build-fix.patch (rev 0)
+++ extra-i686/wpc8769l-build-fix.patch 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,90 @@
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index 790efa2..4248fe9 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -51,17 +51,13 @@
+ #include <linux/irq.h>
+
+ #include <linux/acpi.h>
++#include <linux/types.h>
+
+ #include <linux/platform_device.h>
++#include <asm-generic/bitops/find.h>
+
+-#include "drivers/kcompat.h"
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+-#include <media/lirc.h>
+-#include <media/lirc_dev.h>
+-#else
+-#include "drivers/lirc.h"
+-#include "drivers/lirc_dev/lirc_dev.h"
+-#endif
++#include "media/lirc_dev.h"
++#include "media/lirc.h"
+
+ #include "lirc_wpc8769l.h"
+
+@@ -105,11 +101,11 @@ static unsigned int baseport2;
+ static unsigned int irq;
+
+ /* Debugging flag. */
+-static int debug;
++static bool debug;
+
+ /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and
+ * IRQ. */
+-static int skip_probe;
++static bool skip_probe;
+
+ /* Whether the device is open or not. */
+ static int lirc_wpc8769l_is_open;
+@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
+- next_one = generic_find_next_le_bit(ldata, size, 0);
++ next_one = find_next_bit(ldata, size, 0);
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
+- next_zero = generic_find_next_zero_le_bit(ldata,
++ next_zero = find_next_zero_bit(ldata,
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
+- next_one = generic_find_next_le_bit(ldata,
++ next_one = find_next_bit(ldata,
+ size, next_zero + 1);
+
+ put_pulse_bit(
+@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device
*dev)
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/PKGBUILD 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,98 +0,0 @@
-# $Id$
-# Maintainer: Paul Mattal <[email protected]>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.1
-pkgrel=1
-epoch=1
-_extramodules=extramodules-3.16-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/";
-license=('GPL')
-# NOTICE: Don't forget to bump version in depends in package_lirc()!
-makedepends=('help2man' 'linux>=3.16' 'linux<3.17' 'linux-headers>=3.16'
'linux-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2";
- "wpc8769l-build-fix.patch"
- lirc.logrotate
- irexec.service
- lirc.tmpfiles)
-md5sums=('3b78c3cc872d5e2fa78b796c2efd46db'
- '9ec33169b3407f74264062d7679dd269'
- '3deb02604b37811d41816e9b4385fcc3'
- '32df3b9bc859565d6acf5f0e5b747083'
- 'febf25c154a7d36f01159e84f26c2d9a')
-
-prepare() {
- cd "${srcdir}/lirc-${pkgver}"
-
- patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
-
- sed -i '/AC_PATH_XTRA/d' configure.ac
- sed -e 's/@X_CFLAGS@//g' \
- -e 's/@X_LIBS@//g' \
- -e 's/@X_PRE_LIBS@//g' \
- -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-
- libtoolize
- autoreconf
-}
-
-build() {
- cd "${srcdir}/lirc-${pkgver}"
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
- --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/"
\
- --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \
- --sbindir=/usr/bin --with-transmitter
-
- # Remove drivers already in kernel
- sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
- -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
- -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
- -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
- -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
- make
-}
-
-package_lirc() {
- pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'linux>=3.16' 'linux<3.17')
- replaces=('lirc+pctv')
- install=lirc.install
-
- cd "${srcdir}/lirc-${pkgver}/drivers"
-
- make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}"
install
- gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
-
- # set the kernel we've built for inside the install script
- sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/"
"${startdir}/lirc.install"
-}
-
-package_lirc-utils() {
- pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
- optdepends=('python2: pronto2lirc utility')
- options=('strip')
- backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
- install=lirc-utils.install
-
- cd "${srcdir}/lirc-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}"/irexec.service
"${pkgdir}"/usr/lib/systemd/system/irexec.service
- install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
-
- cp -rp remotes "${pkgdir}/usr/share/lirc"
- chmod -R go-w "${pkgdir}/usr/share/lirc/"
-
- # install the logrotate config
- install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
-
- # remove built modules
- rm -r "${pkgdir}/usr/lib/modules"
-}
Copied: lirc/repos/extra-x86_64/PKGBUILD (from rev 220120, lirc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Paul Mattal <[email protected]>
+
+pkgbase=lirc
+pkgname=('lirc' 'lirc-utils')
+_pkgver=0.9.1a
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" ||
pkgver="$_pkgver"
+pkgrel=1
+epoch=1
+_extramodules=extramodules-3.16-ARCH
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/";
+license=('GPL')
+# NOTICE: Don't forget to bump version in depends in package_lirc()!
+makedepends=('help2man' 'linux>=3.16' 'linux<3.17' 'linux-headers>=3.16'
'linux-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
+options=('!makeflags' '!strip')
+source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2";
+ "wpc8769l-build-fix.patch"
+ lirc.logrotate
+ irexec.service
+ lirc.tmpfiles)
+md5sums=('1f1fac162ed309dd50f307e96a292957'
+ '9ec33169b3407f74264062d7679dd269'
+ '3deb02604b37811d41816e9b4385fcc3'
+ '32df3b9bc859565d6acf5f0e5b747083'
+ 'febf25c154a7d36f01159e84f26c2d9a')
+
+prepare() {
+ cd "${srcdir}/lirc-${_pkgver}"
+
+ patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
+
+ sed -i '/AC_PATH_XTRA/d' configure.ac
+ sed -e 's/@X_CFLAGS@//g' \
+ -e 's/@X_LIBS@//g' \
+ -e 's/@X_PRE_LIBS@//g' \
+ -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+
+ libtoolize
+ autoreconf
+}
+
+build() {
+ cd "${srcdir}/lirc-${_pkgver}"
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
+ --with-driver=all --with-kerneldir="/usr/lib/modules/${_kernver}/build/"
\
+ --with-moduledir="/usr/lib/modules/${_kernver}/kernel/drivers/misc" \
+ --sbindir=/usr/bin --with-transmitter
+
+ # Remove drivers already in kernel
+ sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
+ -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
+ -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
+ -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ make
+}
+
+package_lirc() {
+ pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
+ depends=('lirc-utils' 'linux>=3.16' 'linux<3.17')
+ replaces=('lirc+pctv')
+ install=lirc.install
+
+ cd "${srcdir}/lirc-${_pkgver}/drivers"
+
+ make DESTDIR="${pkgdir}" moduledir="/usr/lib/modules/${_extramodules}"
install
+ gzip -9 "${pkgdir}/usr/lib/modules/${_extramodules}"/*.ko
+
+ # set the kernel we've built for inside the install script
+ sed -i "s/^EXTRAMODULES=.*$/EXTRAMODULES=${_extramodules}/"
"${startdir}/lirc.install"
+}
+
+package_lirc-utils() {
+ pkgdesc="Linux Infrared Remote Control utils"
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
+ optdepends=('python2: pronto2lirc utility')
+ options=('strip')
+ backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
+ install=lirc-utils.install
+
+ cd "${srcdir}/lirc-${_pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/irexec.service
"${pkgdir}"/usr/lib/systemd/system/irexec.service
+ install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
+
+ cp -rp remotes "${pkgdir}/usr/share/lirc"
+ chmod -R go-w "${pkgdir}/usr/share/lirc/"
+
+ # install the logrotate config
+ install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc"
+
+ # remove built modules
+ rm -r "${pkgdir}/usr/lib/modules"
+}
Deleted: extra-x86_64/irexec.service
===================================================================
--- extra-x86_64/irexec.service 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/irexec.service 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC command handler
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/irexec --daemon
-
-[Install]
-WantedBy=multi-user.target
-Wants=lircd.service
Copied: lirc/repos/extra-x86_64/irexec.service (from rev 220120,
lirc/trunk/irexec.service)
===================================================================
--- extra-x86_64/irexec.service (rev 0)
+++ extra-x86_64/irexec.service 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC command handler
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/irexec --daemon
+
+[Install]
+WantedBy=multi-user.target
+Wants=lircd.service
Deleted: extra-x86_64/lirc-utils.install
===================================================================
--- extra-x86_64/lirc-utils.install 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/lirc-utils.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,13 +0,0 @@
-post_install() {
- systemd-tmpfiles --create lirc.conf
-}
-
-post_upgrade() {
- post_install
-
- if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
- echo ':: lirc.service and lircm.service have been replaced'
- echo ' by the upstream unit files lircd.service and'
- echo ' lircmd.service.'
- fi
-}
Copied: lirc/repos/extra-x86_64/lirc-utils.install (from rev 220120,
lirc/trunk/lirc-utils.install)
===================================================================
--- extra-x86_64/lirc-utils.install (rev 0)
+++ extra-x86_64/lirc-utils.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,13 @@
+post_install() {
+ systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+ post_install
+
+ if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
+ echo ':: lirc.service and lircm.service have been replaced'
+ echo ' by the upstream unit files lircd.service and'
+ echo ' lircmd.service.'
+ fi
+}
Deleted: extra-x86_64/lirc.install
===================================================================
--- extra-x86_64/lirc.install 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/lirc.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,14 +0,0 @@
-EXTRAMODULES=extramodules-3.12-ARCH
-
-post_install() {
- echo ">>> Updating module dependencies. Please wait ..."
- depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: lirc/repos/extra-x86_64/lirc.install (from rev 220120,
lirc/trunk/lirc.install)
===================================================================
--- extra-x86_64/lirc.install (rev 0)
+++ extra-x86_64/lirc.install 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,14 @@
+EXTRAMODULES=extramodules-3.12-ARCH
+
+post_install() {
+ echo ">>> Updating module dependencies. Please wait ..."
+ depmod "$(cat /usr/lib/modules/$EXTRAMODULES/version)" >/dev/null 2>&1
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/lirc.logrotate
===================================================================
--- extra-x86_64/lirc.logrotate 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/lirc.logrotate 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1,5 +0,0 @@
-/var/log/lircd {
- missingok
- notifempty
- delaycompress
-}
Copied: lirc/repos/extra-x86_64/lirc.logrotate (from rev 220120,
lirc/trunk/lirc.logrotate)
===================================================================
--- extra-x86_64/lirc.logrotate (rev 0)
+++ extra-x86_64/lirc.logrotate 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
Deleted: extra-x86_64/lirc.tmpfiles
===================================================================
--- extra-x86_64/lirc.tmpfiles 2014-08-16 22:32:11 UTC (rev 220120)
+++ extra-x86_64/lirc.tmpfiles 2014-08-16 22:33:00 UTC (rev 220121)
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -
Copied: lirc/repos/extra-x86_64/lirc.tmpfiles (from rev 220120,
lirc/trunk/lirc.tmpfiles)
===================================================================
--- extra-x86_64/lirc.tmpfiles (rev 0)
+++ extra-x86_64/lirc.tmpfiles 2014-08-16 22:33:00 UTC (rev 220121)
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
Deleted: extra-x86_64/wpc8769l-build-fix.patch
===================================================================
--- extra-x86_64/wpc8769l-build-fix.patch 2014-08-16 22:32:11 UTC (rev
220120)
+++ extra-x86_64/wpc8769l-build-fix.patch 2014-08-16 22:33:00 UTC (rev
220121)
@@ -1,90 +0,0 @@
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index 790efa2..4248fe9 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -51,17 +51,13 @@
- #include <linux/irq.h>
-
- #include <linux/acpi.h>
-+#include <linux/types.h>
-
- #include <linux/platform_device.h>
-+#include <asm-generic/bitops/find.h>
-
--#include "drivers/kcompat.h"
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
--#include <media/lirc.h>
--#include <media/lirc_dev.h>
--#else
--#include "drivers/lirc.h"
--#include "drivers/lirc_dev/lirc_dev.h"
--#endif
-+#include "media/lirc_dev.h"
-+#include "media/lirc.h"
-
- #include "lirc_wpc8769l.h"
-
-@@ -105,11 +101,11 @@ static unsigned int baseport2;
- static unsigned int irq;
-
- /* Debugging flag. */
--static int debug;
-+static bool debug;
-
- /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and
- * IRQ. */
--static int skip_probe;
-+static bool skip_probe;
-
- /* Whether the device is open or not. */
- static int lirc_wpc8769l_is_open;
-@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
- size = count << 3;
-
- ldata = (unsigned long *) data_buf;
-- next_one = generic_find_next_le_bit(ldata, size, 0);
-+ next_one = find_next_bit(ldata, size, 0);
-
- if (next_one > 0)
- put_pulse_bit(next_one
- * WPC8769L_USECS_PER_BIT);
-
- while (next_one < size) {
-- next_zero = generic_find_next_zero_le_bit(ldata,
-+ next_zero = find_next_zero_bit(ldata,
- size, next_one + 1);
-
- put_space_bit(
-@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
- * WPC8769L_USECS_PER_BIT);
-
- if (next_zero < size) {
-- next_one = generic_find_next_le_bit(ldata,
-+ next_one = find_next_bit(ldata,
- size, next_zero + 1);
-
- put_pulse_bit(
-@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void)
- #ifdef MODULE
- static struct platform_device *lirc_wpc8769l_platform_dev;
-
--static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
-+static int lirc_wpc8769l_probe(struct platform_device *dev)
- {
- return 0;
- }
-
--static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
-+static int lirc_wpc8769l_remove(struct platform_device *dev)
- {
- return 0;
- }
-@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device
*dev)
-
- static struct platform_driver lirc_wpc8769l_platform_driver = {
- .probe = lirc_wpc8769l_probe,
-- .remove = __devexit_p(lirc_wpc8769l_remove),
-+ .remove = lirc_wpc8769l_remove,
- .suspend = lirc_wpc8769l_suspend,
- .resume = lirc_wpc8769l_resume,
- .driver = {
Copied: lirc/repos/extra-x86_64/wpc8769l-build-fix.patch (from rev 220120,
lirc/trunk/wpc8769l-build-fix.patch)
===================================================================
--- extra-x86_64/wpc8769l-build-fix.patch (rev 0)
+++ extra-x86_64/wpc8769l-build-fix.patch 2014-08-16 22:33:00 UTC (rev
220121)
@@ -0,0 +1,90 @@
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index 790efa2..4248fe9 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -51,17 +51,13 @@
+ #include <linux/irq.h>
+
+ #include <linux/acpi.h>
++#include <linux/types.h>
+
+ #include <linux/platform_device.h>
++#include <asm-generic/bitops/find.h>
+
+-#include "drivers/kcompat.h"
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+-#include <media/lirc.h>
+-#include <media/lirc_dev.h>
+-#else
+-#include "drivers/lirc.h"
+-#include "drivers/lirc_dev/lirc_dev.h"
+-#endif
++#include "media/lirc_dev.h"
++#include "media/lirc.h"
+
+ #include "lirc_wpc8769l.h"
+
+@@ -105,11 +101,11 @@ static unsigned int baseport2;
+ static unsigned int irq;
+
+ /* Debugging flag. */
+-static int debug;
++static bool debug;
+
+ /* If true, we skip ACPI autodetection and use the parameter-supplied I/O and
+ * IRQ. */
+-static int skip_probe;
++static bool skip_probe;
+
+ /* Whether the device is open or not. */
+ static int lirc_wpc8769l_is_open;
+@@ -360,14 +356,14 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
+ size = count << 3;
+
+ ldata = (unsigned long *) data_buf;
+- next_one = generic_find_next_le_bit(ldata, size, 0);
++ next_one = find_next_bit(ldata, size, 0);
+
+ if (next_one > 0)
+ put_pulse_bit(next_one
+ * WPC8769L_USECS_PER_BIT);
+
+ while (next_one < size) {
+- next_zero = generic_find_next_zero_le_bit(ldata,
++ next_zero = find_next_zero_bit(ldata,
+ size, next_one + 1);
+
+ put_space_bit(
+@@ -375,7 +371,7 @@ static irqreturn_t irq_handler(int irqno, void *blah,
struct pt_regs *regs)
+ * WPC8769L_USECS_PER_BIT);
+
+ if (next_zero < size) {
+- next_one = generic_find_next_le_bit(ldata,
++ next_one = find_next_bit(ldata,
+ size, next_zero + 1);
+
+ put_pulse_bit(
+@@ -922,12 +918,12 @@ static int wpc8769l_acpi_detect(void)
+ #ifdef MODULE
+ static struct platform_device *lirc_wpc8769l_platform_dev;
+
+-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev)
++static int lirc_wpc8769l_probe(struct platform_device *dev)
+ {
+ return 0;
+ }
+
+-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev)
++static int lirc_wpc8769l_remove(struct platform_device *dev)
+ {
+ return 0;
+ }
+@@ -955,7 +951,7 @@ static int lirc_wpc8769l_resume(struct platform_device
*dev)
+
+ static struct platform_driver lirc_wpc8769l_platform_driver = {
+ .probe = lirc_wpc8769l_probe,
+- .remove = __devexit_p(lirc_wpc8769l_remove),
++ .remove = lirc_wpc8769l_remove,
+ .suspend = lirc_wpc8769l_suspend,
+ .resume = lirc_wpc8769l_resume,
+ .driver = {
