On 04/18/2012 03:46 AM, Stefan G. Weichinger wrote: > Am 18.04.2012 12:08, schrieb Stefan G. Weichinger: >> Am 18.04.2012 04:16, schrieb Pandu Poluan: >> >>>> [I'm falling asleep at the keyboard now and I don't want to give you >>>> bogus information, so I'll be back tomorrow with the rest of it.] >>>> >>>> >>> >>> Bah! A cliffhanger! >>> >>> *twiddles thumb waiting for Walt to wake up*
I'm back. Why do I feel just as crappy now as I did last night? Must be the cheap wine, I guess. >> Ah, yeah, looking forward as well ;-) > > I don't want to spoil .... but I got it working already :-P Oh, go ahead and spoil. I'll forgive you eventually. Hey, I just pulled from Linus again and emerged nvidia-drivers and I see that the test for kernel version no longer fails. The rest of the fix is trivial now: diff -ur kernel/nv-linux.h nvidia/nv-linux.h --- kernel/nv-linux.h 2012-04-05 21:37:05.000000000 -0700 +++ nvidia/nv-linux.h 2012-04-12 06:58:31.000000000 -0700 @@ -111,7 +111,6 @@ #include <linux/timer.h> #include <asm/div64.h> /* do_div() */ -#include <asm/system.h> /* cli, sli, save_flags */ #include <asm/io.h> /* ioremap, virt_to_phys */ #include <asm/uaccess.h> /* access_ok */ #include <asm/page.h> /* PAGE_OFFSET */ @@ -1204,7 +1203,6 @@ #endif #if !defined(KERNEL_2_4) && !defined(NV_PM_MESSAGE_T_PRESENT) -typedef u32 pm_message_t; #endif #if defined(KERNEL_2_4) && (defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)) This works because a recent kernel commit removed system.h completely and now the #include system.h is not needed. Also, any time you see a "previously defined" error you can try to work around it by deleting the #include that introduced the "previous definition" in the first place. May work, may not, but it's always worth trying. This time it worked :) Hope I didn't forget anything...
