From e8d6ef494e930a92f4e82481cf013d013efbd66a Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Tue, 14 Sep 1999 18:19:29 +0000
Subject: [PATCH] rename config.h to netboot_config.h in netboot.

---
 ChangeLog                              | 10 ++++++++++
 netboot/Makefile.am                    |  6 +++---
 netboot/Makefile.in                    |  6 +++---
 netboot/config.c                       |  2 +-
 netboot/fsys_tftp.c                    |  2 +-
 netboot/ip.c                           |  2 +-
 netboot/{config.h => netboot_config.h} |  0
 7 files changed, 19 insertions(+), 9 deletions(-)
 rename netboot/{config.h => netboot_config.h} (100%)

diff --git a/ChangeLog b/ChangeLog
index 712045804..90929522c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-09-15  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* netboot/config.h: Moved to ...
+	* netboot/netboot_config.h: ... here.
+	* netboot/config.c: Include netboot_config.h instead of config.h.
+	* netboot/fsys_tftp.c: Likewise.
+	* netboot/ip.c: Likewise.
+	* netboot/Makefile.am (libdrivers_a_SOURCES): Removed config.h
+	and added netboot_config.h.
+	
 1999-09-14  Pavel Roskin  <pavel_roskin@geocities.com>
 
 	* grub/asmstub.c [__linux__]: On GLibc 2.0 and newer use lseek,
diff --git a/netboot/Makefile.am b/netboot/Makefile.am
index 02904628c..62a4e3379 100644
--- a/netboot/Makefile.am
+++ b/netboot/Makefile.am
@@ -13,8 +13,8 @@ noinst_LIBRARIES = $(LIBDRIVERS)
 DRIVERS = 3c509.c 3c509.h 3c59x.c cs89x0.c cs89x0.h eepro100.c \
 	lance.c ns8390.c ns8390.h
 
-libdrivers_a_SOURCES = byteorder.h config.c config.h fsys_tftp.c \
-	if.h io.h ip.c ip.h netboot.h netdevice.h nic.h pci.c pci.h \
-	$(DRIVERS)
+libdrivers_a_SOURCES = byteorder.h config.c netboot_config.h \
+	fsys_tftp.c if.h io.h ip.c ip.h netboot.h netdevice.h nic.h \
+	pci.c pci.h $(DRIVERS)
 libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
 	-DFSYS_TFTP $(NET_CFLAGS) $(NET_EXTRAFLAGS)
diff --git a/netboot/Makefile.in b/netboot/Makefile.in
index 904811b76..e8b26331b 100644
--- a/netboot/Makefile.in
+++ b/netboot/Makefile.in
@@ -95,9 +95,9 @@ DRIVERS = 3c509.c 3c509.h 3c59x.c cs89x0.c cs89x0.h eepro100.c \
 	lance.c ns8390.c ns8390.h
 
 
-libdrivers_a_SOURCES = byteorder.h config.c config.h fsys_tftp.c \
-	if.h io.h ip.c ip.h netboot.h netdevice.h nic.h pci.c pci.h \
-	$(DRIVERS)
+libdrivers_a_SOURCES = byteorder.h config.c netboot_config.h \
+	fsys_tftp.c if.h io.h ip.c ip.h netboot.h netdevice.h nic.h \
+	pci.c pci.h $(DRIVERS)
 
 libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
 	-DFSYS_TFTP $(NET_CFLAGS) $(NET_EXTRAFLAGS)
diff --git a/netboot/config.c b/netboot/config.c
index 6b3e237fa..b63cecf27 100644
--- a/netboot/config.c
+++ b/netboot/config.c
@@ -1,7 +1,7 @@
 #include	"netboot.h"
 #include	"nic.h"
 
-#include	"config.h"
+#include	"netboot_config.h"
 
 #undef	INCLUDE_PCI
 #if	defined(INCLUDE_NEPCI) || defined(INCLUDE_EEPRO100) || defined (INCLUDE_3c59x)
diff --git a/netboot/fsys_tftp.c b/netboot/fsys_tftp.c
index b5db2a5bb..d279cfa6c 100644
--- a/netboot/fsys_tftp.c
+++ b/netboot/fsys_tftp.c
@@ -1,7 +1,7 @@
 #include "../stage2/filesys.h"
 
 #include "netboot.h"
-#include "config.h"
+#include "netboot_config.h"
 #include "nic.h"
 
 #include "ip.h"
diff --git a/netboot/ip.c b/netboot/ip.c
index fc27caf05..5828ca4d4 100644
--- a/netboot/ip.c
+++ b/netboot/ip.c
@@ -1,5 +1,5 @@
 #include "netboot.h"
-#include "config.h"
+#include "netboot_config.h"
 #include "nic.h"
 
 #include "ip.h"
diff --git a/netboot/config.h b/netboot/netboot_config.h
similarity index 100%
rename from netboot/config.h
rename to netboot/netboot_config.h