diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 13:52:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-20 13:52:52 -0800 |
| commit | a4e1328a9d20ccf4a9e5a19fce172e6deb2a33e2 (patch) | |
| tree | 6dca79d197408609608a1d3ac732dbbc94587f6f /drivers/macintosh/Makefile | |
| parent | cdce6ac277a4a1aa5316cd0cdf30fff927433917 (diff) | |
| parent | fe07adec730d271c91f4160f96a0f24fe7553c63 (diff) | |
| download | linux-stericsson-a4e1328a9d20ccf4a9e5a19fce172e6deb2a33e2.tar.gz | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull more i2c updates from Wolfram Sang:
"Included are two bugfixes needing some bigger refactoring (sh_mobile:
deferred probe with DMA, mv64xxx: fix offload support) and one
deprecated driver removal I thought would go in via ppc but I
misunderstood. It has a proper ack from BenH"
* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: sh_mobile: fix uninitialized var when debug is enabled
macintosh: therm_pm72: delete deprecated driver
i2c: sh_mobile: I2C_SH_MOBILE should depend on HAS_DMA
i2c: sh_mobile: rework deferred probing
i2c: sh_mobile: refactor DMA setup
i2c: mv64xxx: rework offload support to fix several problems
i2c: mv64xxx: use BIT() macro for register value definitions
Diffstat (limited to 'drivers/macintosh/Makefile')
| -rw-r--r-- | drivers/macintosh/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index d2f0120bc878..383ba920085b 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_ADB_IOP) += adb-iop.o obj-$(CONFIG_ADB_PMU68K) += via-pmu68k.o obj-$(CONFIG_ADB_MACIO) += macio-adb.o -obj-$(CONFIG_THERM_PM72) += therm_pm72.o obj-$(CONFIG_THERM_WINDTUNNEL) += therm_windtunnel.o obj-$(CONFIG_THERM_ADT746X) += therm_adt746x.o obj-$(CONFIG_WINDFARM) += windfarm_core.o |