Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 47 insertions, 56 deletions

diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
index ac096db95..6edf9ff5e 100644
--- a/drivers/macintosh/Makefile
+++ b/drivers/macintosh/Makefile
@@ -9,76 +9,67 @@
 # parent makes..
 #
 
-SUB_DIRS     := 
-MOD_SUB_DIRS := $(SUB_DIRS)
+# Subdirs.
 
-O_TARGET := macintosh.o
-O_OBJS   :=
-M_OBJS   :=
+SUB_DIRS	:=
+MOD_SUB_DIRS	:= $(SUB_DIRS)
+MOD_IN_SUB_DIRS	:= $(SUB_DIRS)
+ALL_SUB_DIRS	:= $(SUB_DIRS)
 
-ifeq ($(CONFIG_PMAC_PBOOK),y)
-  O_OBJS += mediabay.o
-else
-  ifeq ($(CONFIG_MAC_FLOPPY),y)
-    O_OBJS += mediabay.o
-  endif
-endif
+# The target object and module list name.
 
-ifeq ($(CONFIG_MAC_SERIAL),y)
-  O_OBJS += macserial.o
-else
-  ifeq ($(CONFIG_MAC_SERIAL),m)
-    M_OBJS += macserial.o
-  endif
-endif
+O_TARGET	:= macintosh.o
+M_OBJS		:=
+O_OBJS		:=
+MOD_LIST_NAME	:= MACINTOSH_MODULES
 
-ifeq ($(CONFIG_NVRAM),y)
-  O_OBJS += nvram.o
-else
-  ifeq ($(CONFIG_NVRAM),m)
-    M_OBJS += nvram.o
-  endif
-endif
+# Objects that export symbols.
 
-ifdef CONFIG_ADB
-  OX_OBJS  := adb.o
-endif
+export-objs	:= adb.o rtc.o mac_hid.o
 
-ifdef CONFIG_ADB_KEYBOARD
-  O_OBJS += mac_keyb.o
-endif
+# Object file lists.
 
-ifdef CONFIG_ADB_MACII
-  O_OBJS += via-macii.o
-endif
+obj-y	:=
+obj-m	:=
+obj-n	:=
+obj-	:=
 
-ifdef CONFIG_ADB_MACIISI
-  O_OBJS += via-maciisi.o
-endif
+# Each configuration option enables a list of files.
 
-ifdef CONFIG_ADB_CUDA
-  O_OBJS += via-cuda.o
+ifeq ($(CONFIG_PMAC_PBOOK),y)
+	obj-y			+= mediabay.o
 endif
 
-ifdef CONFIG_ADB_IOP
-  O_OBJS += adb-iop.o
-endif
+obj-$(CONFIG_MAC_SERIAL)	+= macserial.o
+obj-$(CONFIG_NVRAM)		+= nvram.o
+obj-$(CONFIG_MAC_HID)		+= mac_hid.o
+obj-$(CONFIG_INPUT_ADBHID)	+= adbhid.o
+obj-$(CONFIG_PPC_RTC)		+= rtc.o
 
-ifdef CONFIG_ADB_PMU
-  O_OBJS += via-pmu.o
-endif
+obj-$(CONFIG_ADB_PMU)		+= via-pmu.o
+obj-$(CONFIG_ADB_CUDA)		+= via-cuda.o
 
-ifdef CONFIG_ADB_PMU68K
-  O_OBJS += via-pmu68k.o
-endif
+obj-$(CONFIG_ADB)		+= adb.o
+obj-$(CONFIG_ADB_KEYBOARD)	+= mac_keyb.o
+obj-$(CONFIG_ADB_MACII)		+= via-macii.o
+obj-$(CONFIG_ADB_MACIISI)	+= via-maciisi.o
+obj-$(CONFIG_ADB_IOP)		+= adb-iop.o
+obj-$(CONFIG_ADB_PMU68K)	+= via-pmu68k.o
+obj-$(CONFIG_ADB_MACIO)		+= macio-adb.o
 
-ifdef CONFIG_ADB_MACIO
-  O_OBJS += macio-adb.o
-endif
+# 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))
+
+# Translate to Rules.make lists.
+
+O_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-y)))
+OX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-y)))
+M_OBJS		:= $(sort $(filter-out $(export-objs), $(obj-m)))
+MX_OBJS		:= $(sort $(filter     $(export-objs), $(obj-m)))
+
+# The global Rules.make.
 
 include $(TOPDIR)/Rules.make
 
-# Integrated in mac_keyb.c
-# mackeymap.map is retained for historical reasons
-#mackeymap.c: mackeymap.map
-#	loadkeys --mktable mackeymap.map > mackeymap.c