Commit 415f453c authored by Kai Germaschewski's avatar Kai Germaschewski

Link drivers/char/* from drivers/char/Makefile

Link the subdirs of drivers/char from drivers/char/Makefile instead the
top-level Makefile. 

Link order changes slightly, shouldn't case any problems, though.

Fix drivers/char/pcmcia/Config.in.

Cleanup drivers/char/pcmcia/Makefile.

Fix rio build rules in drivers/char/Makefile.
parent e4388f37
...@@ -137,8 +137,6 @@ DRIVERS-y += drivers/base/base.o \ ...@@ -137,8 +137,6 @@ DRIVERS-y += drivers/base/base.o \
drivers/misc/misc.o \ drivers/misc/misc.o \
drivers/net/net.o \ drivers/net/net.o \
drivers/media/media.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_NUBUS) += drivers/nubus/nubus.a
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
...@@ -155,7 +153,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o ...@@ -155,7 +153,6 @@ DRIVERS-$(CONFIG_SOUND) += sound/sound.o
DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.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_DIO) += drivers/dio/dio.a
DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
......
...@@ -150,7 +150,13 @@ obj-$(CONFIG_SPECIALIX) += specialix.o ...@@ -150,7 +150,13 @@ obj-$(CONFIG_SPECIALIX) += specialix.o
obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o
obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o
obj-$(CONFIG_SX) += sx.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_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_SERIAL167) += serial167.o obj-$(CONFIG_SERIAL167) += serial167.o
obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.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 ...@@ -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_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
subdir-$(CONFIG_RIO) += rio
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_PRINTER) += lp.o
...@@ -188,12 +192,8 @@ obj-$(CONFIG_INTEL_RNG) += i810_rng.o ...@@ -188,12 +192,8 @@ obj-$(CONFIG_INTEL_RNG) += i810_rng.o
obj-$(CONFIG_QIC02_TAPE) += tpqic02.o obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
subdir-$(CONFIG_FTAPE) += ftape subdir-$(CONFIG_FTAPE) += ftape
subdir-$(CONFIG_DRM) += drm
subdir-$(CONFIG_PCMCIA) += pcmcia
subdir-$(CONFIG_AGP) += agp
ifeq ($(CONFIG_FTAPE),y) ifeq ($(CONFIG_FTAPE),y)
obj-y += ftape/ftape.o obj-y += ftape/ftape.o
endif endif
obj-$(CONFIG_H8) += h8.o obj-$(CONFIG_H8) += h8.o
...@@ -228,6 +228,21 @@ ifeq ($(CONFIG_MWAVE),y) ...@@ -228,6 +228,21 @@ ifeq ($(CONFIG_MWAVE),y)
obj-y += mwave/mwave.o obj-y += mwave/mwave.o
endif 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 include $(TOPDIR)/Rules.make
fastdep: fastdep:
......
...@@ -5,12 +5,8 @@ ...@@ -5,12 +5,8 @@
mainmenu_option next_comment mainmenu_option next_comment
comment 'PCMCIA character devices' comment 'PCMCIA character devices'
dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_SERIAL dep_tristate 'PCMCIA serial device support' CONFIG_PCMCIA_SERIAL_CS $CONFIG_PCMCIA $CONFIG_SERIAL
if [ "$CONFIG_PCMCIA_SERIAL_CS" = "y" ]; then dep_tristate 'SyncLink PC Card support' CONFIG_SYNCLINK_CS $CONFIG_PCMCIA
define_bool CONFIG_PCMCIA_CHRDEV y
fi
tristate 'SyncLink PC Card support' CONFIG_SYNCLINK_CS
endmenu endmenu
...@@ -4,17 +4,8 @@ ...@@ -4,17 +4,8 @@
# Makefile for the Linux PCMCIA char device drivers. # 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 O_TARGET := pcmcia_char.o
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o obj-$(CONFIG_PCMCIA_SERIAL_CS) += serial_cs.o
obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o obj-$(CONFIG_SYNCLINK_CS) += synclink_cs.o
......
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