diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/Makefile | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 920c975bb6d4..26ca9031ea49 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -58,7 +58,7 @@ obj-$(CONFIG_GAMEPORT) += input/gameport/ | |||
| 58 | obj-$(CONFIG_INPUT) += input/ | 58 | obj-$(CONFIG_INPUT) += input/ |
| 59 | obj-$(CONFIG_I2O) += message/ | 59 | obj-$(CONFIG_I2O) += message/ |
| 60 | obj-$(CONFIG_RTC_LIB) += rtc/ | 60 | obj-$(CONFIG_RTC_LIB) += rtc/ |
| 61 | obj-$(CONFIG_I2C) += i2c/ | 61 | obj-y += i2c/ |
| 62 | obj-$(CONFIG_W1) += w1/ | 62 | obj-$(CONFIG_W1) += w1/ |
| 63 | obj-$(CONFIG_HWMON) += hwmon/ | 63 | obj-$(CONFIG_HWMON) += hwmon/ |
| 64 | obj-$(CONFIG_PHONE) += telephony/ | 64 | obj-$(CONFIG_PHONE) += telephony/ |