Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your

Makefiles.

6 files changed, 6 insertions, 53 deletions

diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 7fdbf65a4..005baaab6 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -10,28 +10,6 @@
 #
 # $Id: Makefile,v 1.22 2000/07/14 08:10:52 dwmw2 Exp $
 
-ifndef CONFIG_MTD
-
-# We're being invoked outside a normal kernel build. Fake it
-EXTRA_CFLAGS= -I$(shell pwd)/../include
-
-MIX_OBJS = mtdcore.o doc2000.o doc2001.o cfi_probe.o cfi_cmdset_0001.o \
-	map_ram.o map_rom.o cfi_cmdset_0002.o
-MI_OBJS = doc1000.o docprobe.o slram.o pmc551.o mtdram.o physmap.o \
-	nora.o octagon-5066.o pnc2000.o rpxlite.o vmax301.o mtdchar.o \
-	mtdblock.o ftl.o nftl.o
-
-CFLAGS_nftl.o := -DCONFIG_NFTL_RW
-CFLAGS_mtdram.o := -DCONFIG_MTDRAM_TOTAL_SIZE=4096 -DCONFIG_MTDRAM_ERASE_SIZE=128
-CFLAGS_physmap.o := -DCONFIG_MTD_PHYSMAP_START=0x8000000 -DCONFIG_MTD_PHYSMAP_LEN=0x4000000
-
-else 
-
-O_OBJS          :=
-OX_OBJS         :=
-M_OBJS          :=
-MX_OBJS         :=
-
 # Object file lists.
 
 obj-y           :=
@@ -44,7 +22,7 @@ SUB_DIRS	:=
 ALL_SUB_DIRS 	:=
 MOD_SUB_DIRS	:=
 
-export-objs	:=	mtdcore.o mtdpart.o
+export-objs	:=	mtdcore.o mtdpart.o jedec.o
 list-multi	:=
 
 # MTD devices
@@ -80,31 +58,4 @@ obj-$(CONFIG_MTD_BLOCK)		+= mtdblock.o
 obj-$(CONFIG_FTL)		+= ftl.o
 obj-$(CONFIG_NFTL)		+= nftl.o nftlmount.o
 
-# Extract lists of the multi-part drivers.
-# The 'int-*' lists are the intermediate files used to build the multi's.
-
-multi-y         := $(filter $(list-multi), $(obj-y))
-multi-m         := $(filter $(list-multi), $(obj-m))
-int-y           := $(sort $(foreach m, $(multi-y), $($(basename $(m))-objs)))
-int-m           := $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
-
-# Files that are both resident and modular: remove from modular.
-
-obj-m           := $(filter-out $(obj-y), $(obj-m))
-int-m           := $(filter-out $(int-y), $(int-m))
-
-# Take multi-part drivers out of obj-y and put components in.
-
-obj-y           := $(filter-out $(list-multi), $(obj-y)) $(int-y)
-
-# Translate to Rules.make lists.
-
-O_OBJS          := $(filter-out $(export-objs), $(obj-y))
-OX_OBJS         := $(filter     $(export-objs), $(obj-y))
-M_OBJS          := $(sort $(filter-out $(export-objs), $(obj-m)))
-MX_OBJS         := $(sort $(filter     $(export-objs), $(obj-m)))
-
-
-endif
-
 include $(TOPDIR)/Rules.make
diff --git a/drivers/mtd/cfi_probe.c b/drivers/mtd/cfi_probe.c
index 392f7aa57..e46d26f56 100644
--- a/drivers/mtd/cfi_probe.c
+++ b/drivers/mtd/cfi_probe.c
@@ -17,7 +17,7 @@
 #include <linux/mtd/cfi.h>
 
 
-static struct mtd_info *cfi_probe(struct map_info *);
+struct mtd_info *cfi_probe(struct map_info *);
 
 static void print_cfi_ident(struct cfi_ident *);
 static void check_cmd_set(struct map_info *, int, unsigned long);
@@ -32,7 +32,7 @@ static const char im_name[] = "cfi_probe";
  * this module is non-zero, i.e. between inter_module_get and
  * inter_module_put.  Keith Owens <kaos@ocs.com.au> 29 Oct 2000.
  */
-static struct mtd_info *cfi_probe(struct map_info *map)
+struct mtd_info *cfi_probe(struct map_info *map)
 {
 	struct mtd_info *mtd = NULL;
 	struct cfi_private *cfi;
diff --git a/drivers/mtd/docprobe.c b/drivers/mtd/docprobe.c
index c67a3489a..37fec2a0c 100644
--- a/drivers/mtd/docprobe.c
+++ b/drivers/mtd/docprobe.c
@@ -41,6 +41,7 @@
 */
 #define DOC_SINGLE_DRIVER
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/errno.h>
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 0a33ed1cf..d1344468b 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -6,6 +6,7 @@
  * 02-nov-2000	Nicolas Pitre		Added read-modify-write with cache
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index bccb687c0..9b2b65bfb 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -9,6 +9,7 @@
 
 #include <linux/mtd/compatmac.h>
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index d1f05930f..0e6252855 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -20,7 +20,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <asm/errno.h>