- remove some references to the missing CERN HIPPI driver. Linking
of kernels compiled with CONFIG_CERN_HIPPI=y would fail with:
drivers/net/net.a(Space.o): In function `hippi_probe':
Space.o(.text+0x16): undefined reference to `cern_hippi_probe'
- suppress the messages from "make checkconfig".
- add text for five options listed by "make checkhelp".
- take the "#include <asm/ipc.h>" directive back out of ipc/util.c, because
<linux/msg.h> has the needed prototypes for both sgbuf and msqid_ds (my
mistake).
I've put on the Web at
http://jpj.net/~trevor/linux/config-2.2.0pre4-maximum a configuration file
which has most features and drivers configured in. It might be useful for
testing.
diff -ruN linux/Documentation/Configure.help linux-2.2.0pre4-local/Documentation/Configure.help
--- linux/Documentation/Configure.help Sat Jan 2 17:50:15 1999
+++ linux-2.2.0pre4-local/Documentation/Configure.help Mon Jan 4 05:23:39 1999
@@ -1202,6 +1202,21 @@
### Add info about Platform2000, EB164, etc.
###
+Primo support
+CONFIG_ALPHA_PRIMO
+ Say Y here if you have an AlphaStation 1000 or 1000A with a
+ Primo processing card, or have an ALCOR Primo AlphaStation 600A.
+
+Gamma support
+CONFIG_ALPHA_GAMMA
+ Say Y here if you want support for the AlphaStation 2000 and 2100.
+
+Math emulation
+CONFIG_MATHEMU
+ Rather than using the FPU in your Alpha, Linux can do floating-
+ point arithmetic with only integer instructions. Say Y or M
+ here if you want this feature.
+
Using SRM as bootloader
CONFIG_ALPHA_SRM
There are two different types of booting firmware on Alphas: SRM,
@@ -1705,6 +1720,18 @@
Say N unless you have such a graphics board or plan to get one
before you next recompile the kernel.
+Apollo support
+CONFIG_APOLLO
+ Say Y here if you want to run Linux on an MC680x0-based Apollo
+ Domain workstation such as the DN3500.
+
+Apollo 3c505 support
+CONFIG_APOLLO_ELPLUS
+ Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card.
+ If you don't have one made for Apollos, you can use one from a PC,
+ except that your Apollo won't be able to boot from it (because the
+ code in the ROM will be for a PC).
+
Atari native chipset support
CONFIG_FB_ATARI
This is the frame buffer device driver for the builtin graphics
@@ -6227,16 +6254,6 @@
under Linux, say Y here (you must also remember to enable the driver
for your HIPPI card below). Most people will say N here.
-CERN HIPPI PCI adapter support
-CONFIG_CERN_HIPPI
- Say Y here if this is your PCI HIPPI network card.
-
- This driver is also available as a module ( = code which can be
- inserted in and removed from the running kernel whenever you want).
- The module will be called cern_hippi.o. If you want to compile it as
- a module, say M here and read Documentation/modules.txt. If unsure,
- say N.
-
Essential RoadRunner HIPPI PCI adapter support
CONFIG_ROADRUNNER
Say Y here if this is your PCI HIPPI network card.
diff -ruN linux/drivers/misc/parport_arc.c linux-2.2.0pre4-local/drivers/misc/parport_arc.c
--- linux/drivers/misc/parport_arc.c Sat Jan 2 17:55:05 1999
+++ linux-2.2.0pre4-local/drivers/misc/parport_arc.c Sun Jan 3 19:45:30 1999
@@ -14,7 +14,6 @@
* a subset of the standard printer control lines connected.
*/
-#include <linux/config.h>
#include <linux/tasks.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff -ruN linux/drivers/misc/parport_ax.c linux-2.2.0pre4-local/drivers/misc/parport_ax.c
--- linux/drivers/misc/parport_ax.c Sat Jan 2 17:55:05 1999
+++ linux-2.2.0pre4-local/drivers/misc/parport_ax.c Sun Jan 3 19:45:34 1999
@@ -11,7 +11,6 @@
* Grant Guenther <grant@torque.net>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff -ruN linux/drivers/misc/parport_procfs.c linux-2.2.0pre4-local/drivers/misc/parport_procfs.c
--- linux/drivers/misc/parport_procfs.c Sat Jan 2 17:55:05 1999
+++ linux-2.2.0pre4-local/drivers/misc/parport_procfs.c Sun Jan 3 19:47:04 1999
@@ -12,6 +12,7 @@
* Cleaned up include files - Russell King <linux@arm.uk.linux.org>
*/
+#include <linux/config.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/errno.h>
diff -ruN linux/drivers/net/8390.c linux-2.2.0pre4-local/drivers/net/8390.c
--- linux/drivers/net/8390.c Mon Dec 28 11:04:21 1998
+++ linux-2.2.0pre4-local/drivers/net/8390.c Mon Jan 4 02:03:55 1999
@@ -1089,7 +1089,6 @@
int start_page)
{
int e8390_base = dev->base_addr;
- struct ei_device *ei_local = (struct ei_device *) dev->priv;
outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
diff -ruN linux/drivers/net/Config.in linux-2.2.0pre4-local/drivers/net/Config.in
--- linux/drivers/net/Config.in Wed Dec 23 14:41:03 1998
+++ linux-2.2.0pre4-local/drivers/net/Config.in Mon Jan 4 01:10:19 1999
@@ -153,7 +153,6 @@
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'HIPPI driver support (EXPERIMENTAL)' CONFIG_HIPPI
if [ "$CONFIG_HIPPI" = "y" ]; then
- bool 'CERN HIPPI PCI adapter support' CONFIG_CERN_HIPPI
bool 'Essential RoadRunner HIPPI PCI adapter support' CONFIG_ROADRUNNER
if [ "$CONFIG_ROADRUNNER" != "n" ]; then
bool ' Use large TX/RX rings' CONFIG_ROADRUNNER_LARGE_RINGS
diff -ruN linux/drivers/net/Space.c linux-2.2.0pre4-local/drivers/net/Space.c
--- linux/drivers/net/Space.c Fri Dec 18 09:37:40 1998
+++ linux-2.2.0pre4-local/drivers/net/Space.c Mon Jan 4 03:40:17 1999
@@ -128,7 +128,6 @@
extern int apfddi_init(struct device *dev);
/* HIPPI boards */
-extern int cern_hippi_probe(struct device *);
extern int rr_hippi_probe(struct device *);
struct devprobe
@@ -541,9 +540,6 @@
return 1;
if (1
-#ifdef CONFIG_CERN_HIPPI
- && cern_hippi_probe(dev)
-#endif
#ifdef CONFIG_ROADRUNNER
&& rr_hippi_probe(dev)
#endif
diff -ruN linux/drivers/scsi/eata_dma_proc.c linux-2.2.0pre4-local/drivers/scsi/eata_dma_proc.c
--- linux/drivers/scsi/eata_dma_proc.c Sat Jan 2 17:55:06 1999
+++ linux-2.2.0pre4-local/drivers/scsi/eata_dma_proc.c Sun Jan 3 19:45:39 1999
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
void swap_statistics(u8 *p)
{
u32 y;
diff -ruN linux/drivers/scsi/eata_pio_proc.c linux-2.2.0pre4-local/drivers/scsi/eata_pio_proc.c
--- linux/drivers/scsi/eata_pio_proc.c Sat Jan 2 17:55:06 1999
+++ linux-2.2.0pre4-local/drivers/scsi/eata_pio_proc.c Sun Jan 3 19:45:44 1999
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
/*
* eata_set_info
* buffer : pointer to the data that has been written to the hostfile
diff -ruN linux/drivers/scsi/imm.h linux-2.2.0pre4-local/drivers/scsi/imm.h
--- linux/drivers/scsi/imm.h Sat Jan 2 10:21:06 1999
+++ linux-2.2.0pre4-local/drivers/scsi/imm.h Sun Jan 3 20:15:00 1999
@@ -62,6 +62,8 @@
*/
/* ------ END OF USER CONFIGURABLE PARAMETERS ----- */
+#include <linux/config.h>
+
#ifdef IMM_CODE
#include <linux/stddef.h>
#include <linux/module.h>
diff -ruN linux/drivers/scsi/ppa.h linux-2.2.0pre4-local/drivers/scsi/ppa.h
--- linux/drivers/scsi/ppa.h Sat Jan 2 10:21:06 1999
+++ linux-2.2.0pre4-local/drivers/scsi/ppa.h Sun Jan 3 20:14:59 1999
@@ -54,6 +54,8 @@
*/
/* ------ END OF USER CONFIGURABLE PARAMETERS ----- */
+#include <linux/config.h>
+
#ifdef PPA_CODE
#include <linux/stddef.h>
#include <linux/module.h>
diff -ruN linux/fs/nfsd/stats.c linux-2.2.0pre4-local/fs/nfsd/stats.c
--- linux/fs/nfsd/stats.c Sat Jan 2 17:55:05 1999
+++ linux-2.2.0pre4-local/fs/nfsd/stats.c Sun Jan 3 19:45:48 1999
@@ -13,7 +13,6 @@
* Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/proc_fs.h>
diff -ruN linux/include/linux/sunrpc/stats.h linux-2.2.0pre4-local/include/linux/sunrpc/stats.h
--- linux/include/linux/sunrpc/stats.h Sat Jan 2 17:55:06 1999
+++ linux-2.2.0pre4-local/include/linux/sunrpc/stats.h Sun Jan 3 22:16:12 1999
@@ -9,6 +9,7 @@
#ifndef _LINUX_SUNRPC_STATS_H
#define _LINUX_SUNRPC_STATS_H
+#include <linux/config.h>
#include <linux/proc_fs.h>
struct rpc_stat {
diff -ruN linux/ipc/util.c linux-2.2.0pre4-local/ipc/util.c
--- linux/ipc/util.c Sat Jan 2 10:22:36 1999
+++ linux-2.2.0pre4-local/ipc/util.c Tue Jan 5 02:49:48 1999
@@ -13,7 +13,7 @@
#include <linux/shm.h>
#include <linux/init.h>
#include <linux/msg.h>
-#include <asm/ipc.h>
+
#include <asm/uaccess.h>
#if defined(CONFIG_SYSVIPC)
diff -ruN linux/net/sunrpc/sysctl.c linux-2.2.0pre4-local/net/sunrpc/sysctl.c
--- linux/net/sunrpc/sysctl.c Sat Jan 2 17:55:06 1999
+++ linux-2.2.0pre4-local/net/sunrpc/sysctl.c Sun Jan 3 19:49:30 1999
@@ -7,6 +7,7 @@
* impossible at the moment.
*/
+#include <linux/config.h>
#include <linux/version.h>
#include <linux/types.h>
#include <linux/linkage.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/