Skip to contentSkip to conversation

Remove <asm/setup.h> from cmdlinepart.c

PATCH In review Bjorn Helgaas 2 participants 2 messages Mar 25, 2004 – Mar 28, 2004 Memory technology devices (MTD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 =====

drivers/mtd/cmdlinepart.c +0 -1
@@ -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 */
#1 lore raw
Quoted 13 lines · Bjorn Helgaas

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:

Quoted 4 lines
	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