Attachment #223831 for bug #303941

View | Details | Raw Unified | Return to bug 303941
Collapse All | Expand All

Lines 111-117 Link Here

(-)usr/src/nv/conftest.sh (-1 / +6 lines)
111	fi	111	fi
112	}	112	}
113		113
114	CONFTEST_PREAMBLE="#include <linux/autoconf.h>	114	CONFTEST_PREAMBLE="#include <linux/version.h>
		115	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
		116	#include <generated/autoconf.h>
		117	#else
		118	#include <linux/autoconf.h>
		119	#endif
115	#if defined(CONFIG_XEN) && \	120	#if defined(CONFIG_XEN) && \
116	defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__)	121	defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__)
117	#define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION	122	#define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION

Lines 49-54 Link Here

(-)usr/src/nv/nvacpi.c (+4 lines)
49	};	49	};
50	#endif	50	#endif
51		51
		52	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33)
		53	#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL)
		54	#endif
		55
52	static struct acpi_driver *nv_acpi_driver;	56	static struct acpi_driver *nv_acpi_driver;
53	static acpi_handle nvif_handle = NULL;	57	static acpi_handle nvif_handle = NULL;
54	static acpi_handle dsm_handle = NULL;	58	static acpi_handle dsm_handle = NULL;

Return to bug 303941