Skip to content

Commit a4e1328

Browse files
torvaldstorvalds
committed
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
2 parents cdce6ac + fe07ade commit a4e1328

File tree

7 files changed

+252
-2804
lines changed

7 files changed

+252
-2804
lines changed

‎drivers/i2c/busses/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,7 @@ config I2C_SH7760
753753

754754
config I2C_SH_MOBILE
755755
tristate "SuperH Mobile I2C Controller"
756+
depends on HAS_DMA
756757
depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
757758
help
758759
If you say yes to this option, support will be included for the

0 commit comments

Comments
 (0)