diff options
author | Jonathan Woithe <jwoithe@physics.adelaide.edu.au> | 2008-08-29 11:50:05 +0930 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-08-29 10:50:25 -0400 |
commit | 29facbced9358781bb395ef68563708a70f5d8c1 (patch) | |
tree | adce6bacab978359e99c8ec16c08e9b2a7209ce8 | |
parent | 837b5981df15b92025f2ae09c7e88d4bb5cbe950 (diff) |
Nosy updates for recent kernels
Hi Kristian
I've had to dig nosy out again for some work that I'm doing and found that
it no longer compiled on recent kernels, mainly due to the IRQ changes made
a few versions ago. The following patch (against today's git) makes it
compile again. I haven't yet tested this since I'm not presently near the
relevant PC but I think it should all be OK.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | nosy.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -10,7 +10,7 @@ dist-files = Makefile nosy-dump.c list.h nosy-user.h nosy.c nosy.h all : nosy.ko nosy-dump -CFLAGS += -DVERSION=\"$(version)\" +EXTRA_CFLAGS += -DVERSION=\"$(version)\" nosy.ko : nosy.c $(MAKE) -C $(kdir) SUBDIRS=$(PWD) modules @@ -466,7 +466,7 @@ bus_reset_handler(struct pcilynx *lynx) static irqreturn_t -irq_handler(int irq, void *device, struct pt_regs *unused) +irq_handler(int irq, void *device) { struct pcilynx *lynx = (struct pcilynx *) device; u32 pci_int_status; @@ -637,7 +637,7 @@ add_card(struct pci_dev *dev, const struct pci_device_id *unused) run_pcl(lynx, lynx->rcv_start_pcl_bus, 0); - if (request_irq(dev->irq, irq_handler, SA_SHIRQ, driver_name, lynx)) + if (request_irq(dev->irq, irq_handler, IRQF_SHARED, driver_name, lynx)) FAIL("Failed to allocate shared interrupt %d.", dev->irq); lynx->misc.parent = &dev->dev; |