]>
Commit | Line | Data |
---|---|---|
1 | Index: usr/src/nv/conftest.sh | |
2 | =================================================================== | |
3 | --- usr/src/nv/conftest.sh | |
4 | +++ usr/src/nv/conftest.sh 2009-12-20 04:15:47.194130196 +0200 | |
5 | @@ -111,7 +111,12 @@ | |
6 | fi | |
7 | } | |
8 | ||
9 | -CONFTEST_PREAMBLE="#include <linux/autoconf.h> | |
10 | +CONFTEST_PREAMBLE="#include <linux/version.h> | |
11 | + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) | |
12 | + #include <generated/autoconf.h> | |
13 | + #else | |
14 | + #include <linux/autoconf.h> | |
15 | + #endif | |
16 | #if defined(CONFIG_XEN) && \ | |
17 | defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) | |
18 | #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION | |
19 | Index: usr/src/nv/nvacpi.c | |
20 | =================================================================== | |
21 | --- usr/src/nv/nvacpi.c | |
22 | +++ usr/src/nv/nvacpi.c 2009-12-20 03:48:28.497758783 +0200 | |
23 | @@ -49,6 +49,10 @@ | |
24 | }; | |
25 | #endif | |
26 | ||
27 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) | |
28 | +#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) | |
29 | +#endif | |
30 | + | |
31 | static struct acpi_driver *nv_acpi_driver; | |
32 | static acpi_handle nvif_handle = NULL; | |
33 | static acpi_handle dsm_handle = NULL; |