diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-01-27 11:31:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-27 11:31:35 +0000 |
| commit | b7b69aeb3f848ac77e8b47cd30b1e4ef057a5be4 (patch) | |
| tree | 2e9d9fb717bc468ba2c534816233f720162ac472 /media-libs/svgalib/files | |
| parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
| download | gentoo-2-b7b69aeb3f848ac77e8b47cd30b1e4ef057a5be4.tar.gz gentoo-2-b7b69aeb3f848ac77e8b47cd30b1e4ef057a5be4.tar.bz2 gentoo-2-b7b69aeb3f848ac77e8b47cd30b1e4ef057a5be4.zip | |
Fix building with linux-2.6.24 #207594 by Eric Bosch.
(Portage version: 2.1.4)
Diffstat (limited to 'media-libs/svgalib/files')
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch index 96d54cbc7518..ae3617da0f7c 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.patch @@ -13,7 +13,7 @@ -CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h) -+CLASS_SIMPLE := $(shell grep class_simple_create $(KDIR)/include/linux/device.h 2>/dev/null) ++CLASS_SIMPLE := $(shell grep -s class_simple_create $(KDIR)/include/linux/device.h) ifneq ($(CLASS_SIMPLE),) CLASS_CFLAGS = -DCLASS_SIMPLE=1 @@ -82,6 +82,14 @@ } #endif +@@ -167,3 +167,7 @@ + #ifndef PCI_VENDOR_ID_RENDITION + #define PCI_VENDOR_ID_RENDITION 0x1163 + #endif ++ ++#ifndef IRQF_SHARED ++# define IRQF_SHARED SA_SHIRQ ++#endif --- svgalib/kernel/svgalib_helper/main.c +++ svgalib/kernel/svgalib_helper/main.c @@ -1,5 +1,3 @@ @@ -122,6 +130,37 @@ int num_devices=0; static char *sdev_id="svgalib_helper"; +@@ -103,7 +103,11 @@ + static volatile int vsync=0; + static wait_queue_head_t vsync_wait; + +-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs) ++static irqreturn_t vsync_interrupt(int irq, void *dev_id ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) ++, struct pt_regs *regs ++#endif ++) + { + struct sh_pci_device *dev = (struct sh_pci_device *)dev_id; + +@@ -360,7 +364,7 @@ + vsync=1; + i=0; + while(irqs[i]!=-1) +- request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id); ++ request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id); + vga_enable_vsync((void *)sdev_id); + wait_event_interruptible(vsync_wait, !vsync); + i=0; +@@ -448,7 +452,7 @@ + int i=sh_pci_devs[minor]->dev->irq; + sh_pci_devs[minor]->opencount++; + if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255) +- request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]); ++ request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]); + } + + #ifndef KERNEL_2_6 @@ -770,10 +770,15 @@ } |