Annotation of /trunk/nvidia/NVIDIA_kernel-2.6.19.patch
Parent Directory | Revision Log
Revision 224 -
(hide annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 1715 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 1715 byte(s)
-new fixes
1 | niro | 224 | Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h |
2 | =================================================================== | ||
3 | --- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv-linux.h | ||
4 | +++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv-linux.h | ||
5 | @@ -14,10 +14,11 @@ | ||
6 | |||
7 | #include "nv.h" | ||
8 | |||
9 | -#include <linux/config.h> | ||
10 | #include <linux/version.h> | ||
11 | #include <linux/utsname.h> | ||
12 | - | ||
13 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) | ||
14 | +#include <linux/config.h> | ||
15 | +#endif | ||
16 | |||
17 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 7) | ||
18 | # error This driver does not support 2.4 kernels older than 2.4.7! | ||
19 | Index: NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c | ||
20 | =================================================================== | ||
21 | --- NVIDIA-Linux-x86_64-1.0-9625-pkg2.orig/usr/src/nv/nv.c | ||
22 | +++ NVIDIA-Linux-x86_64-1.0-9625-pkg2/usr/src/nv/nv.c | ||
23 | @@ -288,7 +288,11 @@ int nv_kern_ioctl(struct inode | ||
24 | long nv_kern_unlocked_ioctl(struct file *, unsigned int, unsigned long); | ||
25 | long nv_kern_compat_ioctl(struct file *, unsigned int, unsigned long); | ||
26 | void nv_kern_isr_bh(unsigned long); | ||
27 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) | ||
28 | irqreturn_t nv_kern_isr(int, void *, struct pt_regs *); | ||
29 | +#else | ||
30 | +irqreturn_t nv_kern_isr(int, void *); | ||
31 | +#endif | ||
32 | void nv_kern_rc_timer(unsigned long); | ||
33 | #if defined(NV_PM_SUPPORT_OLD_STYLE_APM) | ||
34 | static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *); | ||
35 | @@ -2595,8 +2599,10 @@ long nv_kern_compat_ioctl( | ||
36 | */ | ||
37 | irqreturn_t nv_kern_isr( | ||
38 | int irq, | ||
39 | - void *arg, | ||
40 | - struct pt_regs *regs | ||
41 | + void *arg | ||
42 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) | ||
43 | + , struct pt_regs *regs | ||
44 | +#endif | ||
45 | ) | ||
46 | { | ||
47 | nv_linux_state_t *nvl = (void *) arg; |