1 |
mrness 08/01/29 11:45:10 |
2 |
|
3 |
Added: openadsl-kernel-2.6.patch |
4 |
Removed: openadsl-makefile.2.6.patch |
5 |
Log: |
6 |
Fix broken compilation on hosts with kernel 2.6.24 (#207647). |
7 |
(Portage version: 2.1.3.19) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-dialup/openadsl/files/openadsl-kernel-2.6.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/openadsl/files/openadsl-kernel-2.6.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/openadsl/files/openadsl-kernel-2.6.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: openadsl-kernel-2.6.patch |
16 |
=================================================================== |
17 |
diff -Nru pulsar-4.0.24.orig/makefile.2.6 pulsar-4.0.24/makefile.2.6 |
18 |
--- pulsar-4.0.24.orig/makefile.2.6 2007-06-26 09:49:40.000000000 +0300 |
19 |
+++ pulsar-4.0.24/makefile.2.6 2008-01-29 13:42:52.000000000 +0200 |
20 |
@@ -5,7 +5,7 @@ |
21 |
|
22 |
ifneq ($(KERNELRELEASE),) |
23 |
|
24 |
-GCC = $(shell ${CC} --version | head -n 1 | sed -e 's/[^0-9. ]//g;s/^ *//;s\[.].*\\g') |
25 |
+GCC = $(shell ${CC} --version | head -n 1 | sed -e 's/[[:alnum:]-]*//;s/[^0-9. ]//g;s/^ *//;s\[.].*\\g') |
26 |
|
27 |
obj-m := pulsar_atm.o |
28 |
pulsar_atm-lib := libpulsar_fw$(GCC).a |
29 |
diff -Nru pulsar-4.0.24.orig/pulsar.c pulsar-4.0.24/pulsar.c |
30 |
--- pulsar-4.0.24.orig/pulsar.c 2007-06-29 02:59:21.000000000 +0300 |
31 |
+++ pulsar-4.0.24/pulsar.c 2008-01-29 13:42:18.000000000 +0200 |
32 |
@@ -1015,7 +1015,11 @@ |
33 |
|
34 |
/* Register interrupt */ |
35 |
adsl_irq_disable(pmodem); |
36 |
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) |
37 |
err = request_irq(pci_dev->irq, isr, SA_SHIRQ, name, pmodem); |
38 |
+#else |
39 |
+ err = request_irq(pci_dev->irq, isr, IRQF_SHARED, name, pmodem); |
40 |
+#endif |
41 |
if (err) { |
42 |
printk(KERN_ERR "%s: IRQ request failure\n", name); |
43 |
goto pulsar_init_exit_irq; |
44 |
|
45 |
|
46 |
|
47 |
-- |
48 |
gentoo-commits@l.g.o mailing list |