2004-03-25 17:46:56

by Bjorn Helgaas

[permalink] [raw]
Subject: [PATCH] Remove <asm/setup.h> from cmdlinepart.c

Remove include of <asm/setup.h> from cmdlinepart.c. This
is not be needed for i386 (it builds fine with this patch),
and ia64 doesn't supply a setup.h.

asm/setup.h contains a hodge-podge of stuff with no real
consistency between architectures. It appears to be
included mainly by arch-specific drivers:
acsi (Atari disks)
amiflop (Amiga floppy)
z2ram (ZorroII ram disk)
amiserial (Amiga serial)
...
and under arch-specific #ifdefs:
fbcon (under __mc68000__ or CONFIG_APUS)
fonts (ditto)
logo (CONFIG_M68K)
...

===== drivers/mtd/cmdlinepart.c 1.5 vs edited =====
--- 1.5/drivers/mtd/cmdlinepart.c Wed May 28 09:01:08 2003
+++ edited/drivers/mtd/cmdlinepart.c Wed Mar 24 11:48:19 2004
@@ -28,7 +28,6 @@

#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-#include <asm/setup.h>
#include <linux/bootmem.h>

/* error message prefix */


2004-03-28 21:08:26

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] Remove <asm/setup.h> from cmdlinepart.c

On Thu, 25 Mar 2004, Bjorn Helgaas wrote:
> Remove include of <asm/setup.h> from cmdlinepart.c. This
> is not be needed for i386 (it builds fine with this patch),
> and ia64 doesn't supply a setup.h.
>
> asm/setup.h contains a hodge-podge of stuff with no real
> consistency between architectures. It appears to be
> included mainly by arch-specific drivers:
> acsi (Atari disks)
> amiflop (Amiga floppy)
> z2ram (ZorroII ram disk)
> amiserial (Amiga serial)
> ...
> and under arch-specific #ifdefs:
> fbcon (under __mc68000__ or CONFIG_APUS)
> fonts (ditto)
> logo (CONFIG_M68K)
> ...

Indeed, <asm/setup.h> was introduced in the m68k port.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds