2001-10-11 13:26:03

by willy tarreau

[permalink] [raw]
Subject: Re: Linux-2.4.10-ac11

> I also _think_ nothing else needs the include in
<asm-i386/keyboard.h> so kill that off too.

indeed, there are some files which need it and don't
compile
anymore. You have to leave the include enabled in
keyboard.h :

- arch/i386/kernel/dmi_scan.c
- drivers/char/keyboard.c
- potentially other files in drivers/char/

Regards,
Willy


___________________________________________________________
Un nouveau Nokia Game commence.
Allez sur http://fr.yahoo.com/nokiagame avant le 3 novembre
pour participer ? cette aventure tous m?dias.


2001-10-11 15:00:50

by Tom Rini

[permalink] [raw]
Subject: Re: Linux-2.4.10-ac11

On Thu, Oct 11, 2001 at 03:26:09PM +0200, willy tarreau wrote:
> > I also _think_ nothing else needs the include in
> <asm-i386/keyboard.h> so kill that off too.
>
> indeed, there are some files which need it and don't
> compile
> anymore. You have to leave the include enabled in
> keyboard.h :
>
> - arch/i386/kernel/dmi_scan.c
> - drivers/char/keyboard.c
> - potentially other files in drivers/char/

Erm, these files should include <linux/pm.h> directly and not expect
something else to pull it in. Doing a quick grep shows that everything
else does.

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

2001-10-11 15:11:30

by willy tarreau

[permalink] [raw]
Subject: Re: Linux-2.4.10-ac11

> Erm, these files should include <linux/pm.h>
directly and not
> expect something else to pull it in. Doing a quick
grep
> shows that everything else does.

well, I find it normal that a file which uses some
definitions
includes the required files itself. Else, a single
change in any
".h" file would have repercussions on many files and
external
projects.

Willy


___________________________________________________________
Un nouveau Nokia Game commence.
Allez sur http://fr.yahoo.com/nokiagame avant le 3 novembre
pour participer ? cette aventure tous m?dias.

2001-10-11 15:21:02

by Tom Rini

[permalink] [raw]
Subject: Re: Linux-2.4.10-ac11

On Thu, Oct 11, 2001 at 05:10:45PM +0200, willy tarreau wrote:
> > Erm, these files should include <linux/pm.h>
> > directly and not
> > expect something else to pull it in. Doing a quick
> > grep
> > shows that everything else does.
>
> well, I find it normal that a file which uses some definitions
> includes the required files itself. Else, a single change in any
> ".h" file would have repercussions on many files and external
> projects.

Er, d'oh. After looking a bit <asm-i386/keyboard.h> does need
<linux/pm.h>. Still, pc_keyb.c is used on other arches and the code in
question looks to be wholly specific to a Dell laptop.

Alan, please apply the following which just adds <linux/pm.h> to the
include list on drivers/char/pc_keyb.c

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

--- linux-2.4.10-ac11.orig/drivers/char/pc_keyb.c Wed Oct 10 19:10:27 2001
+++ linux-2.4.10-ac11/drivers/char/pc_keyb.c Wed Oct 10 19:35:15 2001
@@ -34,6 +34,7 @@
#include <linux/vt_kern.h>
#include <linux/smp_lock.h>
#include <linux/kd.h>
+#include <linux/pm.h>

#include <asm/keyboard.h>
#include <asm/bitops.h>