diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
tree | 28369f5a844535ff836565eefd62695b0e890fa3 /drivers/char/Makefile | |
parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r-- | drivers/char/Makefile | 91 |
1 files changed, 47 insertions, 44 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index 090d154098bb..a73cb4956928 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile | |||
@@ -41,60 +41,63 @@ obj-$(CONFIG_N_HDLC) += n_hdlc.o | |||
41 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o | 41 | obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o |
42 | obj-$(CONFIG_SX) += sx.o generic_serial.o | 42 | obj-$(CONFIG_SX) += sx.o generic_serial.o |
43 | obj-$(CONFIG_RIO) += rio/ generic_serial.o | 43 | obj-$(CONFIG_RIO) += rio/ generic_serial.o |
44 | obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvc_vio.o hvsi.o | 44 | obj-$(CONFIG_HVC_DRIVER) += hvc_console.o |
45 | obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o | ||
46 | obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o | ||
45 | obj-$(CONFIG_RAW_DRIVER) += raw.o | 47 | obj-$(CONFIG_RAW_DRIVER) += raw.o |
46 | obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o | 48 | obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o |
47 | obj-$(CONFIG_MMTIMER) += mmtimer.o | 49 | obj-$(CONFIG_MMTIMER) += mmtimer.o |
48 | obj-$(CONFIG_VIOCONS) += viocons.o | 50 | obj-$(CONFIG_VIOCONS) += viocons.o |
49 | obj-$(CONFIG_VIOTAPE) += viotape.o | 51 | obj-$(CONFIG_VIOTAPE) += viotape.o |
50 | obj-$(CONFIG_HVCS) += hvcs.o | 52 | obj-$(CONFIG_HVCS) += hvcs.o |
51 | obj-$(CONFIG_SGI_MBCS) += mbcs.o | 53 | obj-$(CONFIG_SGI_MBCS) += mbcs.o |
52 | 54 | ||
53 | obj-$(CONFIG_PRINTER) += lp.o | 55 | obj-$(CONFIG_PRINTER) += lp.o |
54 | obj-$(CONFIG_TIPAR) += tipar.o | 56 | obj-$(CONFIG_TIPAR) += tipar.o |
55 | 57 | ||
56 | obj-$(CONFIG_DTLK) += dtlk.o | 58 | obj-$(CONFIG_DTLK) += dtlk.o |
57 | obj-$(CONFIG_R3964) += n_r3964.o | 59 | obj-$(CONFIG_R3964) += n_r3964.o |
58 | obj-$(CONFIG_APPLICOM) += applicom.o | 60 | obj-$(CONFIG_APPLICOM) += applicom.o |
59 | obj-$(CONFIG_SONYPI) += sonypi.o | 61 | obj-$(CONFIG_SONYPI) += sonypi.o |
60 | obj-$(CONFIG_RTC) += rtc.o | 62 | obj-$(CONFIG_RTC) += rtc.o |
61 | obj-$(CONFIG_HPET) += hpet.o | 63 | obj-$(CONFIG_HPET) += hpet.o |
62 | obj-$(CONFIG_GEN_RTC) += genrtc.o | 64 | obj-$(CONFIG_GEN_RTC) += genrtc.o |
63 | obj-$(CONFIG_EFI_RTC) += efirtc.o | 65 | obj-$(CONFIG_EFI_RTC) += efirtc.o |
64 | obj-$(CONFIG_SGI_DS1286) += ds1286.o | 66 | obj-$(CONFIG_SGI_DS1286) += ds1286.o |
65 | obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o | 67 | obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o |
66 | obj-$(CONFIG_DS1302) += ds1302.o | 68 | obj-$(CONFIG_DS1302) += ds1302.o |
67 | obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o | 69 | obj-$(CONFIG_S3C2410_RTC) += s3c2410-rtc.o |
68 | obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o | 70 | obj-$(CONFIG_RTC_VR41XX) += vr41xx_rtc.o |
69 | ifeq ($(CONFIG_GENERIC_NVRAM),y) | 71 | ifeq ($(CONFIG_GENERIC_NVRAM),y) |
70 | obj-$(CONFIG_NVRAM) += generic_nvram.o | 72 | obj-$(CONFIG_NVRAM) += generic_nvram.o |
71 | else | 73 | else |
72 | obj-$(CONFIG_NVRAM) += nvram.o | 74 | obj-$(CONFIG_NVRAM) += nvram.o |
73 | endif | 75 | endif |
74 | obj-$(CONFIG_TOSHIBA) += toshiba.o | 76 | obj-$(CONFIG_TOSHIBA) += toshiba.o |
75 | obj-$(CONFIG_I8K) += i8k.o | 77 | obj-$(CONFIG_I8K) += i8k.o |
76 | obj-$(CONFIG_DS1620) += ds1620.o | 78 | obj-$(CONFIG_DS1620) += ds1620.o |
77 | obj-$(CONFIG_HW_RANDOM) += hw_random.o | 79 | obj-$(CONFIG_HW_RANDOM) += hw_random.o |
78 | obj-$(CONFIG_FTAPE) += ftape/ | 80 | obj-$(CONFIG_FTAPE) += ftape/ |
79 | obj-$(CONFIG_COBALT_LCD) += lcd.o | 81 | obj-$(CONFIG_COBALT_LCD) += lcd.o |
80 | obj-$(CONFIG_PPDEV) += ppdev.o | 82 | obj-$(CONFIG_PPDEV) += ppdev.o |
81 | obj-$(CONFIG_NWBUTTON) += nwbutton.o | 83 | obj-$(CONFIG_NWBUTTON) += nwbutton.o |
82 | obj-$(CONFIG_NWFLASH) += nwflash.o | 84 | obj-$(CONFIG_NWFLASH) += nwflash.o |
83 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o | 85 | obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o |
84 | obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o | 86 | obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o |
85 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o | 87 | obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o |
86 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o | 88 | obj-$(CONFIG_TANBAC_TB0219) += tb0219.o |
87 | obj-$(CONFIG_TELCLOCK) += tlclk.o | 89 | obj-$(CONFIG_TELCLOCK) += tlclk.o |
88 | 90 | ||
89 | obj-$(CONFIG_WATCHDOG) += watchdog/ | 91 | obj-$(CONFIG_WATCHDOG) += watchdog/ |
90 | obj-$(CONFIG_MWAVE) += mwave/ | 92 | obj-$(CONFIG_MWAVE) += mwave/ |
91 | obj-$(CONFIG_AGP) += agp/ | 93 | obj-$(CONFIG_AGP) += agp/ |
92 | obj-$(CONFIG_DRM) += drm/ | 94 | obj-$(CONFIG_DRM) += drm/ |
93 | obj-$(CONFIG_PCMCIA) += pcmcia/ | 95 | obj-$(CONFIG_PCMCIA) += pcmcia/ |
94 | obj-$(CONFIG_IPMI_HANDLER) += ipmi/ | 96 | obj-$(CONFIG_IPMI_HANDLER) += ipmi/ |
95 | 97 | ||
96 | obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o | 98 | obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o |
97 | obj-$(CONFIG_TCG_TPM) += tpm/ | 99 | obj-$(CONFIG_TCG_TPM) += tpm/ |
100 | |||
98 | # Files generated that shall be removed upon make clean | 101 | # Files generated that shall be removed upon make clean |
99 | clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c | 102 | clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c |
100 | 103 | ||