diff options
Diffstat (limited to 'drivers/char/Makefile')
| -rw-r--r-- | drivers/char/Makefile | 121 |
1 files changed, 75 insertions, 46 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 490ad02e3..e86c937a9 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -11,7 +11,7 @@ SUB_DIRS := MOD_SUB_DIRS := $(SUB_DIRS) -ALL_SUB_DIRS := $(SUB_DIRS) ftape joystick +ALL_SUB_DIRS := $(SUB_DIRS) ftape joystick pcmcia # # This file contains the font map for the default (hardware) font @@ -277,7 +277,7 @@ O_OBJS += softdog.o else ifeq ($(CONFIG_SOFT_WATCHDOG),m) M_OBJS += softdog.o - endif + endif endif ifeq ($(CONFIG_PCWATCHDOG),y) @@ -338,6 +338,10 @@ endif ifeq ($(CONFIG_RTC),y) O_OBJS += rtc.o +else + ifeq ($(CONFIG_RTC),m) + M_OBJS += rtc.o + endif endif ifeq ($(CONFIG_NVRAM),y) @@ -378,16 +382,6 @@ else endif endif -ifeq ($(CONFIG_VIDEO_SAA5249),y) -O_OBJS += saa5249.o -L_I2C=y -else - ifeq ($(CONFIG_VIDEO_SAA5249),m) - M_OBJS += saa5249.o - M_I2C=y - endif -endif - ifeq ($(CONFIG_I2C_PARPORT),y) O_OBJS += i2c-parport.o L_I2C = y @@ -398,11 +392,13 @@ else endif endif -ifeq ($(CONFIG_VIDEO_BWQCAM),y) -O_OBJS += bw-qcam.o +ifeq ($(CONFIG_VIDEO_SAA5249),y) +O_OBJS += saa5249.o +L_I2C=y else - ifeq ($(CONFIG_VIDEO_BWQCAM),m) - M_OBJS += bw-qcam.o + ifeq ($(CONFIG_VIDEO_SAA5249),m) + M_OBJS += saa5249.o + M_I2C=y endif endif @@ -414,6 +410,14 @@ else endif endif +ifeq ($(CONFIG_VIDEO_BWQCAM),y) +O_OBJS += bw-qcam.o +else + ifeq ($(CONFIG_VIDEO_BWQCAM),m) + M_OBJS += bw-qcam.o + endif +endif + ifeq ($(CONFIG_VIDEO_ZORAN),y) O_OBJS += buz.o else @@ -462,13 +466,29 @@ else endif endif +ifeq ($(CONFIG_VIDEO_STRADIS),y) +O_OBJS += vino.o +else + ifeq ($(CONFIG_VIDEO_STRADIS),m) + M_OBJS += stradis.o + endif +endif + ifeq ($(CONFIG_RADIO_AZTECH),y) O_OBJS += radio-aztech.o else ifeq ($(CONFIG_RADIO_AZTECH),m) M_OBJS += radio-aztech.o endif -endif +endif + +ifeq ($(CONFIG_RADIO_RTRACK2),y) +O_OBJS += radio-rtrack2.o +else + ifeq ($(CONFIG_RADIO_RTRACK2),m) + M_OBJS += radio-rtrack2.o + endif +endif ifeq ($(CONFIG_RADIO_SF16FMI),y) O_OBJS += radio-sf16fmi.o @@ -476,23 +496,15 @@ else ifeq ($(CONFIG_RADIO_SF16FMI),m) M_OBJS += radio-sf16fmi.o endif -endif - -ifeq ($(CONFIG_RADIO_RTRACK),y) -O_OBJS += radio-aimslab.o -else - ifeq ($(CONFIG_RADIO_RTRACK),m) - M_OBJS += radio-aimslab.o - endif -endif +endif -ifeq ($(CONFIG_RADIO_RTRACK2),y) -O_OBJS += radio-rtrack2.o +ifeq ($(CONFIG_RADIO_CADET),y) +O_OBJS += radio-cadet.o else - ifeq ($(CONFIG_RADIO_RTRACK2),m) - M_OBJS += radio-rtrack2.o + ifeq ($(CONFIG_RADIO_CADET),m) + M_OBJS += radio-cadet.o endif -endif +endif ifeq ($(CONFIG_RADIO_TYPHOON),y) O_OBJS += radio-typhoon.o @@ -500,7 +512,23 @@ else ifeq ($(CONFIG_RADIO_TYPHOON),m) M_OBJS += radio-typhoon.o endif -endif +endif + +ifeq ($(CONFIG_RADIO_TERRATEC),y) +O_OBJS += radio-terratec.o +else + ifeq ($(CONFIG_RADIO_TERRATEC),m) + M_OBJS += radio-terratec.o + endif +endif + +ifeq ($(CONFIG_RADIO_RTRACK),y) +O_OBJS += radio-aimslab.o +else + ifeq ($(CONFIG_RADIO_RTRACK),m) + M_OBJS += radio-aimslab.o + endif +endif ifeq ($(CONFIG_RADIO_ZOLTRIX),y) O_OBJS += radio-zoltrix.o @@ -508,15 +536,7 @@ else ifeq ($(CONFIG_RADIO_ZOLTRIX),m) M_OBJS += radio-zoltrix.o endif -endif - -ifeq ($(CONFIG_RADIO_CADET),y) -O_OBJS += radio-cadet.o -else - ifeq ($(CONFIG_RADIO_CADET),m) - M_OBJS += radio-cadet.o - endif -endif +endif ifeq ($(CONFIG_RADIO_MIROPCM20),y) O_OBJS += radio-miropcm20.o @@ -532,13 +552,13 @@ else ifeq ($(CONFIG_RADIO_GEMTEK),m) M_OBJS += radio-gemtek.o endif -endif +endif -ifeq ($(CONFIG_RADIO_TERRATEC),y) -O_OBJS += radio-terratec.o +ifeq ($(CONFIG_RADIO_TRUST),y) +O_OBJS += radio-trust.o else - ifeq ($(CONFIG_RADIO_TERRATEC),m) - M_OBJS += radio-terratec.o + ifeq ($(CONFIG_RADIO_TRUST),m) + M_OBJS += radio-trust.o endif endif @@ -591,6 +611,15 @@ ifeq ($(CONFIG_DRM),y) MOD_SUB_DIRS += drm endif +ifeq ($(CONFIG_PCMCIA),y) + SUB_DIRS += pcmcia + MOD_IN_SUB_DIRS += pcmcia +else + ifeq ($(CONFIG_PCMCIA),m) + MOD_IN_SUB_DIRS += pcmcia + endif +endif + include $(TOPDIR)/Rules.make fastdep: |