aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 22:33:04 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-28 22:33:04 -0400
commit7b5573769f26a23518b33a64ec129d2833564877 (patch)
tree697674b1d2bf12541fc745baa8ef8d9e6faf8888 /drivers/i2c
parent8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e (diff)
parent27b92bdbd589cf3f59244bf5e848e7be254a2e4c (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Input Serio: Blackfin doesnt support I8042 - make sure it doesnt get selected Blackfin arch: add BF54x I2C/TWI TWI0 driver support Blackfin On-Chip RTC driver update for supporting BF54x Blackfin Ethernet MAC driver: fix bug Report returned -ENOMEM upwards (in case L1/uncached memory alloc fails) Blackfin arch: add error message when IRQ no available Blackfin arch: Initialize the exception vectors early in the boot process Blackfin arch: fix a compiling warning about dma-mapping Blackfin arch: switch to using proper defines this time THREAD_SIZE and PAGE_SIZE instead of just PAGE_SIZE everywhere Blackfin arch: fix bug which unaligns the init thread's stack and causes the current macro to fail. Blackfin arch: Load P0 before storing through it Blackfin arch: fix KGDB bug, dont forget last parameter. Blackfin arch: add selections for BF544 and BF542 Blackfin arch: use bfin_read_SWRST() now that BF561 provides it Blackfin arch: setup aliases for some core Core A MMRs
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index da1647869f91..1842f523c23d 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -92,9 +92,9 @@ config I2C_AU1550
92 92
93config I2C_BLACKFIN_TWI 93config I2C_BLACKFIN_TWI
94 tristate "Blackfin TWI I2C support" 94 tristate "Blackfin TWI I2C support"
95 depends on BF534 || BF536 || BF537 95 depends on BF534 || BF536 || BF537 || BF54x
96 help 96 help
97 This is the TWI I2C device driver for Blackfin 534/536/537. 97 This is the TWI I2C device driver for Blackfin 534/536/537/54x.
98 This driver can also be built as a module. If so, the module 98 This driver can also be built as a module. If so, the module
99 will be called i2c-bfin-twi. 99 will be called i2c-bfin-twi.
100 100