Skip to content

L
linux
Commit 91a30776 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge http://linux-isdn.bkbits.net/linux-2.5.make 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents ef078caa fd7a5492
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 116 deletions
Makefile
View file @ 91a30776
......@@ -137,14 +137,12 @@ DRIVERS-y += drivers/base/base.o \
drivers/misc/misc.o \
drivers/net/net.o \
drivers/media/media.o
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o
DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
......@@ -155,7 +153,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
DRIVERS-$(CONFIG_PCMCIA_CHRDEV) += drivers/char/pcmcia/pcmcia_char.o
DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
......@@ -170,7 +167,7 @@ DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
......@@ -381,18 +378,9 @@ else
depmod_opts := -b $(INSTALL_MOD_PATH) -r
endif
.PHONY: _modinst_post
_modinst_post: _modinst_post_pcmcia
_modinst_post:
if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
# Backwards compatibilty symlinks for people still using old versions
# of pcmcia-cs with hard coded pathnames on insmod. Remove
# _modinst_post_pcmcia for kernel 2.4.1.
.PHONY: _modinst_post_pcmcia
_modinst_post_pcmcia:
cd $(MODLIB); \
mkdir -p pcmcia; \
find kernel -path '*/pcmcia/*' -name '*.o' | xargs -i -r ln -sf ../{} pcmcia
.PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
$(patsubst %, _modinst_%, $(SUBDIRS)) :
$(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install
......
drivers/Makefile
View file @ 91a30776
......@@ -7,8 +7,8 @@
mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
fc4 net/hamradio i2c acpi bluetooth input/serio \
message scsi md ieee1394 pnp isdn atm \
fc4 i2c acpi bluetooth input/serio \
input/gameport parport hotplug
subdir-y := base char block net misc media cdrom
......@@ -35,8 +35,8 @@ subdir-$(CONFIG_PHONE) += telephony
subdir-$(CONFIG_SGI) += sgi
subdir-$(CONFIG_IDE) += ide
subdir-$(CONFIG_SCSI) += scsi
subdir-$(CONFIG_I2O) += message/i2o
subdir-$(CONFIG_FUSION) += message/fusion
subdir-$(CONFIG_I2O) += message
subdir-$(CONFIG_FUSION) += message
subdir-$(CONFIG_MD) += md
subdir-$(CONFIG_IEEE1394) += ieee1394
subdir-$(CONFIG_PNP) += pnp
......
drivers/block/genhd.c
View file @ 91a30776
......@@ -199,7 +199,7 @@ struct seq_operations partitions_op = {
extern int blk_dev_init(void);
#ifdef CONFIG_FUSION_BOOT
#ifdef CONFIG_FUSION
extern int fusion_init(void);
#endif
extern int net_dev_init(void);
......@@ -216,7 +216,7 @@ int __init device_init(void)
#ifdef CONFIG_I2O
i2o_init();
#endif
#ifdef CONFIG_FUSION_BOOT
#ifdef CONFIG_FUSION
fusion_init();
#endif
#ifdef CONFIG_FC4_SOC
......
drivers/char/Makefile
View file @ 91a30776
......@@ -150,7 +150,13 @@ obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.o generic_serial.o
obj-$(CONFIG_RIO) += rio/rio.o generic_serial.o
obj-$(CONFIG_RIO) += generic_serial.o
subdir-$(CONFIG_RIO) += rio
ifeq ($(CONFIG_RIO),y)
obj-y += rio/rio.o
endif
obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o
......@@ -158,8 +164,6 @@ obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
subdir-$(CONFIG_RIO) += rio
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o
......@@ -188,12 +192,8 @@ obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
subdir-$(CONFIG_FTAPE) += ftape
subdir-$(CONFIG_DRM) += drm
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_AGP) += agp
ifeq ($(CONFIG_FTAPE),y)
obj-y += ftape/ftape.o
obj-y += ftape/ftape.o
endif
obj-$(CONFIG_H8) += h8.o
......@@ -228,6 +228,21 @@ ifeq ($(CONFIG_MWAVE),y)
obj-y += mwave/mwave.o
endif
subdir-$(CONFIG_AGP) += agp
ifeq ($(CONFIG_AGP),y)
obj-y += agp/agp.o
endif
subdir-$(CONFIG_DRM) += drm
ifeq ($(CONFIG_DRM),y)
obj-y += drm/drm.o
endif
subdir-$(CONFIG_PCMCIA) += pcmcia
ifeq ($(CONFIG_PCMCIA),y)
obj-y += pcmcia/pcmcia_char.o
endif
include $(TOPDIR)/Rules.make
fastdep:
......
drivers/char/pcmcia/Config.in
View file @ 91a30776
......@@ -5,12 +5,8 @@
mainmenu_option next_comment
comment 'PCMCIA character devices'
dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_SERIAL
if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" ]; then
define_bool CONFIG_PCMCIA_CHRDEV y
fi
tristate 'SyncLink PC Card support' CONFIG_SYNCLINK_CS
dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA $CONFIG_SERIAL
dep_tristate 'SyncLink PC Card support' CONFIG_SYNCLINK_CS $CONFIG_PCMCIA
endmenu
drivers/char/pcmcia/Makefile
View file @ 91a30776
......@@ -4,17 +4,8 @@
# Makefile for the Linux PCMCIA char device drivers.
#
SUB_DIRS :=
MOD_SUB_DIRS := $(SUB_DIRS)
ALL_SUB_DIRS := $(SUB_DIRS)
O_TARGET := pcmcia_char.o
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o
obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
......
drivers/char/serial.c
View file @ 91a30776
......@@ -5226,7 +5226,8 @@ static struct pnp_board pnp_devices[] __devinitdata = {
static void inline avoid_irq_share(struct pci_dev *dev)
{
int i, map = 0x1FF8;
int i;
unsigned long map = 0x1FF8;
struct serial_state *state = rs_table;
struct isapnp_irq *irq;
struct isapnp_resources *res = dev->sysdata;
......
drivers/message/Makefile 0 → 100644
View file @ 91a30776
#
# Makefile for MPT based block devices
#
O_TARGET := message.o
mod-subdirs := i2o fusion
subdir-$(CONFIG_I2O) += i2o
ifeq($(CONFIG_I2O),y)
obj-y += i2o/i2o.o
endif
subdir-$(CONFIG_FUSION) += fusion
ifeq($(CONFIG_FUSION),y)
obj-y += fusion/fusion.o
endif
drivers/message/fusion/Config.in
View file @ 91a30776
......@@ -5,35 +5,21 @@ dep_tristate "Fusion MPT (base + ScsiHost) drivers" CONFIG_FUSION $CONFIG_SCSI $
if [ "$CONFIG_FUSION" = "y" -o "$CONFIG_FUSION" = "m" ]; then
if [ "$CONFIG_BLK_DEV_SD" = "y" -a "$CONFIG_FUSION" = "y" ]; then
define_bool CONFIG_FUSION_BOOT y
if [ "$CONFIG_FUSION" = "y" ]; then
comment "(ability to boot linux kernel from Fusion device is ENABLED!)"
else
define_bool CONFIG_FUSION_BOOT n
comment "(ability to boot linux kernel from Fusion device is DISABLED!)"
fi
if [ "$CONFIG_MODULES" = "y" ]; then
# How can we force these options to module or nothing?
dep_tristate " Enhanced SCSI error reporting" CONFIG_FUSION_ISENSE $CONFIG_FUSION m
dep_tristate " Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m
fi
# Modular only
dep_tristate " Enhanced SCSI error reporting" CONFIG_FUSION_ISENSE $CONFIG_FUSION m
dep_tristate " Fusion MPT misc device (ioctl) driver" CONFIG_FUSION_CTL $CONFIG_FUSION m
dep_tristate " Fusion MPT LAN driver" CONFIG_FUSION_LAN $CONFIG_FUSION $CONFIG_NET
if [ "$CONFIG_FUSION_LAN" != "n" ]; then
define_bool CONFIG_NET_FC y
fi
else
define_bool CONFIG_FUSION_BOOT n
# These <should> be define_tristate, but we leave them define_bool
# for backward compatibility with pre-linux-2.2.15 kernels.
# (Bugzilla:fibrebugs, #384)
define_bool CONFIG_FUSION_ISENSE n
define_bool CONFIG_FUSION_CTL n
define_bool CONFIG_FUSION_LAN n
fi
endmenu
drivers/pcmcia/Config.in
View file @ 91a30776
......@@ -7,25 +7,20 @@
mainmenu_option next_comment
comment 'PCMCIA/CardBus support'
#dep_tristate 'CardBus support' CONFIG_PCMCIA $CONFIG_PCI
#if [ "$CONFIG_PCMCIA" != "n" ]; then
# define_bool CONFIG_CARDBUS y
#fi
tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
if [ "$CONFIG_PCMCIA" != "n" ]; then
if [ "$CONFIG_PCI" != "n" ]; then
bool ' CardBus support' CONFIG_CARDBUS
fi
dep_bool ' i82092 compatible bridge support' CONFIG_I82092 $CONFIG_PCI
bool ' i82365 compatible bridge support' CONFIG_I82365
bool ' Databook TCIC host bridge support' CONFIG_TCIC
dep_tristate ' i82092 compatible bridge support' CONFIG_I82092 $CONFIG_PCMCIA $CONFIG_PCI
dep_tristate ' i82365 compatible bridge support' CONFIG_I82365 $CONFIG_PCMCIA
dep_tristate ' Databook TCIC host bridge support' CONFIG_TCIC $CONFIG_PCMCIA
if [ "$CONFIG_HD64465" = "y" ]; then
dep_tristate ' HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
fi
fi
if [ "$CONFIG_ARM" = "y" ]; then
dep_tristate ' SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA
if [ "$CONFIG_ARM" = "y" ]; then
dep_tristate ' SA1100 support' CONFIG_PCMCIA_SA1100 $CONFIG_ARCH_SA1100 $CONFIG_PCMCIA
fi
fi
endmenu
drivers/pcmcia/Makefile
View file @ 91a30776
......@@ -6,52 +6,22 @@ O_TARGET := pcmcia.o
export-objs := ds.o cs.o yenta.o pci_socket.o
yenta_socket-objs := pci_socket.o yenta.o
pcmcia_core-objs := cistpl.o rsrc_mgr.o bulkmem.o cs.o
obj-$(CONFIG_PCMCIA) += pcmcia_core.o ds.o
ifeq ($(CONFIG_CARDBUS),y)
pcmcia_core-objs += cardbus.o
obj-$(CONFIG_PCMCIA) += yenta_socket.o
endif
ifeq ($(CONFIG_PCMCIA),y)
obj-y := cistpl.o rsrc_mgr.o bulkmem.o ds.o cs.o
ifeq ($(CONFIG_CARDBUS),y)
obj-y += cardbus.o yenta.o pci_socket.o
endif
ifeq ($(CONFIG_I82365),y)
obj-y += i82365.o
endif
ifeq ($(CONFIG_I82092),y)
obj-y += i82092.o
endif
ifeq ($(CONFIG_TCIC),y)
obj-y += tcic.o
endif
ifeq ($(CONFIG_HD64465_PCMCIA),y)
obj-y += hd64465_ss.o
endif
else
ifeq ($(CONFIG_PCMCIA),m)
obj-m := pcmcia_core.o ds.o
ifeq ($(CONFIG_I82365),y)
obj-m += i82365.o
endif
ifeq ($(CONFIG_I82092),y)
obj-m += i82092.o
endif
ifeq ($(CONFIG_TCIC),y)
obj-m += tcic.o
endif
ifeq ($(CONFIG_HD64465_PCMCIA),m)
obj-m += hd64465_ss.o
endif
ifeq ($(CONFIG_CARDBUS),y)
obj-m += yenta_socket.o
endif
endif
endif
obj-$(CONFIG_I82365) += i82365.o
obj-$(CONFIG_I82092) += i82092.o
obj-$(CONFIG_TCIC) += tcic.o
obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
yenta_socket-objs := pci_socket.o yenta.o
obj-$(CONFIG_PCMCIA_SA1100) += sa1100_cs.o
pcmcia_core-objs-y := cistpl.o rsrc_mgr.o bulkmem.o cs.o
pcmcia_core-objs-$(CONFIG_CARDBUS) += cardbus.o
pcmcia_core-objs := $(pcmcia_core-y)
sa1100_cs-objs-y := sa1100_generic.o
sa1100_cs-objs-$(CONFIG_SA1100_ADSBITSY) += sa1100_adsbitsy.o sa1111_generic.o
......@@ -74,5 +44,6 @@ sa1100_cs-objs-$(CONFIG_SA1100_STORK) += sa1100_stork.o
sa1100_cs-objs-$(CONFIG_SA1100_TRIZEPS) += sa1100_trizeps.o
sa1100_cs-objs-$(CONFIG_SA1100_XP860) += sa1100_xp860.o sa1111_generic.o
sa1100_cs-objs-$(CONFIG_SA1100_YOPY) += sa1100_yopy.o
sa1100_cs-objs := $(sa11000_cs-objs-y)
include $(TOPDIR)/Rules.make
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7