diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 01:11:30 -0400 |
| commit | 45c091bb2d453ce4a8b06cf19872ec7a77fc4799 (patch) | |
| tree | 06fb2e05518ebfba163f8424e028e7faf5672d66 /drivers/i2c | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| parent | 2191fe3e39159e3375f4b7ec1420df149f154101 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits)
[POWERPC] re-enable OProfile for iSeries, using timer interrupt
[POWERPC] support ibm,extended-*-frequency properties
[POWERPC] Extra sanity check in EEH code
[POWERPC] Dont look for class-code in pci children
[POWERPC] Fix mdelay badness on shared processor partitions
[POWERPC] disable floating point exceptions for init
[POWERPC] Unify ppc syscall tables
[POWERPC] mpic: add support for serial mode interrupts
[POWERPC] pseries: Print PCI slot location code on failure
[POWERPC] spufs: one more fix for 64k pages
[POWERPC] spufs: fail spu_create with invalid flags
[POWERPC] spufs: clear class2 interrupt status before wakeup
[POWERPC] spufs: fix Makefile for "make clean"
[POWERPC] spufs: remove stop_code from struct spu
[POWERPC] spufs: fix spu irq affinity setting
[POWERPC] spufs: further abstract priv1 register access
[POWERPC] spufs: split the Cell BE support into generic and platform dependant parts
[POWERPC] spufs: dont try to access SPE channel 1 count
[POWERPC] spufs: use kzalloc in create_spu
[POWERPC] spufs: fix initial state of wbox file
...
Manually resolved conflicts in:
drivers/net/phy/Makefile
include/asm-powerpc/spu.h
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index f7af7e9bb7d9..884320e70403 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -255,12 +255,12 @@ config I2C_POWERMAC | |||
| 255 | will be called i2c-powermac. | 255 | will be called i2c-powermac. |
| 256 | 256 | ||
| 257 | config I2C_MPC | 257 | config I2C_MPC |
| 258 | tristate "MPC107/824x/85xx/52xx" | 258 | tristate "MPC107/824x/85xx/52xx/86xx" |
| 259 | depends on I2C && PPC32 | 259 | depends on I2C && PPC32 |
| 260 | help | 260 | help |
| 261 | If you say yes to this option, support will be included for the | 261 | If you say yes to this option, support will be included for the |
| 262 | built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and | 262 | built-in I2C interface on the MPC107/Tsi107/MPC8240/MPC8245 and |
| 263 | MPC85xx family processors. The driver may also work on 52xx | 263 | MPC85xx/MPC8641 family processors. The driver may also work on 52xx |
| 264 | family processors, though interrupts are known not to work. | 264 | family processors, though interrupts are known not to work. |
| 265 | 265 | ||
| 266 | This driver can also be built as a module. If so, the module | 266 | This driver can also be built as a module. If so, the module |