diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /drivers/Makefile | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 6495411337d8..55205c8d2318 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -54,6 +54,7 @@ obj-$(CONFIG_SERIO) += input/serio/ | |||
| 54 | obj-$(CONFIG_GAMEPORT) += input/gameport/ | 54 | obj-$(CONFIG_GAMEPORT) += input/gameport/ |
| 55 | obj-$(CONFIG_INPUT) += input/ | 55 | obj-$(CONFIG_INPUT) += input/ |
| 56 | obj-$(CONFIG_I2O) += message/ | 56 | obj-$(CONFIG_I2O) += message/ |
| 57 | obj-$(CONFIG_RTC_LIB) += rtc/ | ||
| 57 | obj-$(CONFIG_I2C) += i2c/ | 58 | obj-$(CONFIG_I2C) += i2c/ |
| 58 | obj-$(CONFIG_W1) += w1/ | 59 | obj-$(CONFIG_W1) += w1/ |
| 59 | obj-$(CONFIG_HWMON) += hwmon/ | 60 | obj-$(CONFIG_HWMON) += hwmon/ |
| @@ -66,6 +67,7 @@ obj-$(CONFIG_MCA) += mca/ | |||
| 66 | obj-$(CONFIG_EISA) += eisa/ | 67 | obj-$(CONFIG_EISA) += eisa/ |
| 67 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 68 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
| 68 | obj-$(CONFIG_MMC) += mmc/ | 69 | obj-$(CONFIG_MMC) += mmc/ |
| 70 | obj-$(CONFIG_NEW_LEDS) += leds/ | ||
| 69 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 71 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
| 70 | obj-$(CONFIG_SGI_SN) += sn/ | 72 | obj-$(CONFIG_SGI_SN) += sn/ |
| 71 | obj-y += firmware/ | 73 | obj-y += firmware/ |