| 1 |
Index: usr/src/nv/conftest.sh
|
| 2 |
===================================================================
|
| 3 |
--- usr/src/nv/conftest.sh
|
| 4 |
+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530
|
| 5 |
@@ -32,14 +32,14 @@
|
| 6 |
# CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats
|
| 7 |
# the kernel as a stand-alone kernel.
|
| 8 |
#
|
| 9 |
- FILE="linux/autoconf.h"
|
| 10 |
+ FILE="generated/autoconf.h"
|
| 11 |
|
| 12 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
|
| 13 |
#
|
| 14 |
# We are looking at a configured source tree; verify
|
| 15 |
# that it's not a Xen kernel.
|
| 16 |
#
|
| 17 |
- echo "#include <linux/autoconf.h>
|
| 18 |
+ echo "#include <generated/autoconf.h>
|
| 19 |
#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
|
| 20 |
#error CONFIG_XEN defined!
|
| 21 |
#endif
|
| 22 |
@@ -111,7 +111,12 @@
|
| 23 |
fi
|
| 24 |
}
|
| 25 |
|
| 26 |
-CONFTEST_PREAMBLE="#include <linux/autoconf.h>
|
| 27 |
+CONFTEST_PREAMBLE="#include <linux/version.h>
|
| 28 |
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
|
| 29 |
+ #include <generated/autoconf.h>
|
| 30 |
+ #else
|
| 31 |
+ #include <linux/autoconf.h>
|
| 32 |
+ #endif
|
| 33 |
#if defined(CONFIG_XEN) && \
|
| 34 |
defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__)
|
| 35 |
#define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION
|
| 36 |
@@ -1294,7 +1299,7 @@
|
| 37 |
echo "";
|
| 38 |
fi
|
| 39 |
fi
|
| 40 |
- exit $RET
|
| 41 |
+# exit $RET
|
| 42 |
;;
|
| 43 |
|
| 44 |
get_uname)
|
| 45 |
@@ -1316,11 +1321,11 @@
|
| 46 |
# tree or at headers shipped for a specific kernel.
|
| 47 |
# Determine the kernel version using a compile check.
|
| 48 |
#
|
| 49 |
- FILE="linux/utsrelease.h"
|
| 50 |
+ FILE="generated/utsrelease.h"
|
| 51 |
|
| 52 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
|
| 53 |
echo "$CONFTEST_PREAMBLE
|
| 54 |
- #include <linux/utsrelease.h>
|
| 55 |
+ #include <generated/utsrelease.h>
|
| 56 |
int main() {
|
| 57 |
printf(\"%s\", UTS_RELEASE);
|
| 58 |
return 0;
|
| 59 |
@@ -1375,7 +1380,7 @@
|
| 60 |
#
|
| 61 |
RET=1
|
| 62 |
VERBOSE=$6
|
| 63 |
- FILE="linux/autoconf.h"
|
| 64 |
+ FILE="generated/autoconf.h"
|
| 65 |
|
| 66 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
|
| 67 |
#
|
| 68 |
@@ -1429,7 +1434,7 @@
|
| 69 |
#
|
| 70 |
RET=1
|
| 71 |
VERBOSE=$6
|
| 72 |
- FILE="linux/autoconf.h"
|
| 73 |
+ FILE="generated/autoconf.h"
|
| 74 |
|
| 75 |
if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then
|
| 76 |
#
|
| 77 |
Index: usr/src/nv/nvacpi.c
|
| 78 |
===================================================================
|
| 79 |
--- usr/src/nv/nvacpi.c
|
| 80 |
+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530
|
| 81 |
@@ -49,6 +49,10 @@
|
| 82 |
};
|
| 83 |
#endif
|
| 84 |
|
| 85 |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
|
| 86 |
+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
|
| 87 |
+#endif
|
| 88 |
+
|
| 89 |
static struct acpi_driver *nv_acpi_driver;
|
| 90 |
static acpi_handle nvif_handle = NULL;
|
| 91 |
static acpi_handle dsm_handle = NULL;
|
| 92 |
|
Parent Directory
| 
Revision Log