From e826e576816a106dd7fd20e8af5b8c88b80701b9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 23 Aug 2005 02:40:12 +0000 Subject: Move qc-usb --- .../qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 ---------------------- packages/qc-usb-messenger/qc-usb-messenger_0.8.bb | 2 +- packages/qc-usb/.mtn2git_empty | 0 .../qc-usb/qc-usb-messenger-0.8/.mtn2git_empty | 0 .../qc-usb-messenger-0.8/qc-messenger-0.8-fix | 25 ++++++++++++++++++++++ 6 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty delete mode 100644 packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix create mode 100644 packages/qc-usb/.mtn2git_empty create mode 100644 packages/qc-usb/qc-usb-messenger-0.8/.mtn2git_empty create mode 100644 packages/qc-usb/qc-usb-messenger-0.8/qc-messenger-0.8-fix (limited to 'packages') diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix deleted file mode 100644 index ff3572db8d..0000000000 --- a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c ---- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 -+++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 -@@ -63,9 +63,9 @@ - #endif - - #if !HAVE_VMA --static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } --#undef remap_page_range --#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) -+static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } -+#undef io_remap_page_range -+#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) - #endif - - #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) -@@ -230,7 +230,7 @@ - pos = (unsigned long)src; - while ((long)size > 0) { - physaddr = kvirt_to_pa(pos); -- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) -+ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) - return -EAGAIN; - start += PAGE_SIZE; - pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb index e7041c6990..2720b3af59 100644 --- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb +++ b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" PRIORITY = "optional" SECTION = "kernel/modules" -MAINTAINER = "Oyvind Repvik =KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; -- cgit v1.2.3