Merge with Linux 2.3.99-pre3.

3 files changed, 159 insertions, 80 deletions

diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 6821efbc1..bffafa918 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -19,10 +19,6 @@ COMPILE_ARCH = $(shell uname -m)
 # override top level makefile
 AS += -m68020
 LD += -m m68kelf
-ifneq ($(COMPILE_ARCH),$(ARCH))
-	# prefix for cross-compiling binaries
-	CROSS_COMPILE = m68k-linux-
-endif
 
 ifndef CONFIG_SUN3
 LINKFLAGS = -T $(TOPDIR)/arch/m68k/vmlinux.lds
diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 52b81739e..edcbeb98a 100644
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -15,6 +15,7 @@ endmenu
 mainmenu_option next_comment
 comment 'Platform dependent setup'
 
+define_bool CONFIG_ISA n
 bool 'Amiga support' CONFIG_AMIGA
 bool 'Atari support' CONFIG_ATARI
 if [ "$CONFIG_ATARI" = "y" ]; then
diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig
index e11c32b95..d7261f600 100644
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+CONFIG_UID16=y
 
 #
 # Code maturity level options
@@ -8,18 +9,19 @@
 CONFIG_EXPERIMENTAL=y
 
 #
-# Loadable module support
-#
-# CONFIG_MODULES is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_KMOD is not set
-
-#
-# Platform-dependent setup
+# Platform dependent setup
 #
+# CONFIG_ISA is not set
 CONFIG_AMIGA=y
 # CONFIG_ATARI is not set
+# CONFIG_PCI is not set
 # CONFIG_MAC is not set
+# CONFIG_APOLLO is not set
+# CONFIG_VME is not set
+# CONFIG_HP300 is not set
+# CONFIG_SUN3X is not set
+# CONFIG_SUN3 is not set
+# CONFIG_Q40 is not set
 
 #
 # Processor type
@@ -28,42 +30,48 @@ CONFIG_M68020=y
 CONFIG_M68030=y
 CONFIG_M68040=y
 # CONFIG_M68060 is not set
+# CONFIG_M68KFPU_EMU is not set
 # CONFIG_ADVANCED is not set
-# CONFIG_SINGLE_MEMORY_CHUNK is not set
-# CONFIG_RMW_INSNS is not set
 
 #
 # General setup
 #
 CONFIG_NET=y
 CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 CONFIG_KCORE_ELF=y
 # CONFIG_KCORE_AOUT is not set
 CONFIG_BINFMT_AOUT=y
 CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
 CONFIG_ZORRO=y
-# CONFIG_AMIGA_GSP is not set
-# CONFIG_GSP_RESOLVER is not set
-# CONFIG_GSP_A2410 is not set
 # CONFIG_AMIGA_PCMCIA is not set
 # CONFIG_HEARTBEAT is not set
 CONFIG_PROC_HARDWARE=y
+# CONFIG_PARPORT is not set
+# CONFIG_PRINTER is not set
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
 
 #
-# Block device driver configuration
+# Block devices
 #
+# CONFIG_BLK_DEV_FD is not set
 CONFIG_AMIGA_FLOPPY=y
-CONFIG_ATARI_FLOPPY=y
-# CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_AMIGA_Z2RAM is not set
-# CONFIG_ATARI_ACSI is not set
-# CONFIG_ACSI_MULTI_LUN is not set
-# CONFIG_ATARI_SLM
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+
+#
+# Additional Block Devices
+#
 # CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
 # CONFIG_BLK_DEV_MD is not set
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_STRIPED is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_INITRD=y
 
@@ -71,8 +79,9 @@ CONFIG_BLK_DEV_INITRD=y
 # Networking options
 #
 CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
 # CONFIG_NETLINK is not set
-# CONFIG_FIREWALL is not set
+# CONFIG_NETFILTER is not set
 # CONFIG_FILTER is not set
 CONFIG_UNIX=y
 CONFIG_INET=y
@@ -88,16 +97,17 @@ CONFIG_INET=y
 #
 # (it is safe to leave these untouched)
 #
-# CONFIG_INET_RARP is not set
-CONFIG_IP_NOSR=y
 # CONFIG_SKB_LARGE is not set
 # CONFIG_IPV6 is not set
+# CONFIG_KHTTPD is not set
+# CONFIG_ATM is not set
 
 #
 #  
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
+# CONFIG_DECNET is not set
 # CONFIG_X25 is not set
 # CONFIG_LAPB is not set
 # CONFIG_BRIDGE is not set
@@ -106,7 +116,6 @@ CONFIG_IP_NOSR=y
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_FASTROUTE is not set
 # CONFIG_NET_HW_FLOWCONTROL is not set
-# CONFIG_CPU_IS_SLOW is not set
 
 #
 # QoS and/or fair queueing
@@ -117,6 +126,8 @@ CONFIG_IP_NOSR=y
 # ATA/IDE/MFM/RLL support
 #
 # CONFIG_IDE is not set
+# CONFIG_BLK_DEV_IDE_MODES is not set
+# CONFIG_BLK_DEV_HD is not set
 
 #
 # SCSI support
@@ -124,12 +135,15 @@ CONFIG_IP_NOSR=y
 CONFIG_SCSI=y
 
 #
-# SCSI support type (disk, tape, CDrom)
+# SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=y
+CONFIG_SD_EXTRA_DEVS=40
 CONFIG_CHR_DEV_ST=y
+CONFIG_ST_EXTRA_DEVS=2
 CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_SR_EXTRA_DEVS=2
 # CONFIG_CHR_DEV_SG is not set
 
 #
@@ -143,6 +157,7 @@ CONFIG_SCSI_CONSTANTS=y
 # SCSI low-level drivers
 #
 CONFIG_A3000_SCSI=y
+# CONFIG_A4000T_SCSI is not set
 CONFIG_A2091_SCSI=y
 CONFIG_GVP11_SCSI=y
 # CONFIG_CYBERSTORM_SCSI is not set
@@ -150,13 +165,10 @@ CONFIG_GVP11_SCSI=y
 # CONFIG_BLZ2060_SCSI is not set
 # CONFIG_BLZ1230_SCSI is not set
 # CONFIG_FASTLANE_SCSI is not set
-# CONFIG_A4000T_SCSI is not set
 # CONFIG_A4091_SCSI is not set
 # CONFIG_WARPENGINE_SCSI is not set
 # CONFIG_BLZ603EPLUS_SCSI is not set
-CONFIG_ATARI_SCSI=y
-# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
-# CONFIG_ATARI_SCSI_RESET_BOOT is not set
+# CONFIG_OKTAGON_SCSI is not set
 
 #
 # Network device support
@@ -165,80 +177,150 @@ CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_SLIP is not set
 # CONFIG_PPP is not set
+# CONFIG_EQUALIZER is not set
 # CONFIG_ARIADNE is not set
 # CONFIG_ARIADNE2 is not set
 # CONFIG_A2065 is not set
 # CONFIG_HYDRA is not set
-# CONFIG_APNE is not set
-# CONFIG_ATARILANCE is not set
-# CONFIG_ATARI_BIONET is not set
-# CONFIG_ATARI_PAMSNET is not set
 
 #
-# Filesystems
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_AMIGAMOUSE=y
+CONFIG_BUSMOUSE=y
+CONFIG_AMIGA_BUILTIN_SERIAL=y
+# CONFIG_GVPIOEXT is not set
+# CONFIG_GVPIOEXT_LP is not set
+# CONFIG_GVPIOEXT_PLIP is not set
+# CONFIG_MULTIFACE_III_TTY is not set
+# CONFIG_SERIAL_CONSOLE is not set
+# CONFIG_USERIAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+
+#
+# Sound support
+#
+# CONFIG_SOUND is not set
+
+#
+# File systems
 #
 # CONFIG_QUOTA is not set
-CONFIG_MINIX_FS=y
-CONFIG_EXT2_FS=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BFS_FS is not set
 CONFIG_FAT_FS=y
 CONFIG_MSDOS_FS=y
-# CONFIG_VFAT_FS is not set
 # CONFIG_UMSDOS_FS is not set
-# CONFIG_MSDOS_PARTITION is not set
-CONFIG_PROC_FS=y
-CONFIG_NFS_FS=y
-# CONFIG_ROOT_NFS is not set
-# CONFIG_SMB_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
 # CONFIG_ISO9660_FS is not set
+# CONFIG_JOLIET is not set
+CONFIG_MINIX_FS=y
+# CONFIG_NTFS_FS is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_AFFS_FS is not set
+CONFIG_PROC_FS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
 # CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
 # CONFIG_UFS_FS is not set
-# CONFIG_CRAMFS is not set
 
 #
-# Frame buffer devices
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+CONFIG_NFS_FS=y
+# CONFIG_ROOT_NFS is not set
+# CONFIG_NFSD is not set
+CONFIG_SUNRPC=y
+CONFIG_LOCKD=y
+# CONFIG_SMB_FS is not set
+# CONFIG_NCP_FS is not set
+
+#
+# Partition Types
 #
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_AMIGA_PARTITION=y
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+
+#
+# Console drivers
+#
+CONFIG_FB=y
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_CLGEN is not set
+# CONFIG_FB_PM2 is not set
 CONFIG_FB_AMIGA=y
 CONFIG_FB_AMIGA_OCS=y
 CONFIG_FB_AMIGA_ECS=y
 CONFIG_FB_AMIGA_AGA=y
 # CONFIG_FB_CYBER is not set
 # CONFIG_FB_VIRGE is not set
-# CONFIG_FB_CVPPC is not set
 # CONFIG_FB_RETINAZ3 is not set
-# CONFIG_FB_CLGEN is not set
-# CONFIG_FB_ATARI is not set
+# CONFIG_FB_FM2 is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
-
-CONFIG_NLS_CODEPAGE_437=y
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_M68K_PRINTER is not set
-CONFIG_AMIGAMOUSE=y
-CONFIG_ATARIMOUSE=y
-CONFIG_AMIGA_BUILTIN_SERIAL=y
-# CONFIG_GVPIOEXT is not set
-# CONFIG_GVPIOEXT_LP is not set
-# CONFIG_GVPIOEXT_PLIP is not set
-# CONFIG_MULTIFACE_III_TTY is not set
-# CONFIG_USERIAL is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_UMISC is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-# CONFIG_DMASOUND is not set
+CONFIG_FBCON_MFB=y
+CONFIG_FBCON_AFB=y
+CONFIG_FBCON_ILBM=y
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+# CONFIG_FBCON_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_PEARL_8x8=y
 
 #
 # Kernel hacking
 #
-CONFIG_SCSI_CONSTANTS=y
+# CONFIG_MAGIC_SYSRQ is not set