diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /drivers/i2c/busses/Kconfig | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -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 0d9667921f61..510816c16da3 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig | |||
| @@ -333,10 +333,10 @@ config I2C_PARPORT_LIGHT | |||
| 333 | 333 | ||
| 334 | This driver is a light version of i2c-parport. It doesn't depend | 334 | This driver is a light version of i2c-parport. It doesn't depend |
| 335 | on the parport driver, and uses direct I/O access instead. This | 335 | on the parport driver, and uses direct I/O access instead. This |
| 336 | might be prefered on embedded systems where wasting memory for | 336 | might be preferred on embedded systems where wasting memory for |
| 337 | the clean but heavy parport handling is not an option. The | 337 | the clean but heavy parport handling is not an option. The |
| 338 | drawback is a reduced portability and the impossibility to | 338 | drawback is a reduced portability and the impossibility to |
| 339 | dasiy-chain other parallel port devices. | 339 | daisy-chain other parallel port devices. |
| 340 | 340 | ||
| 341 | Don't say Y here if you said Y or M to i2c-parport. Saying M to | 341 | Don't say Y here if you said Y or M to i2c-parport. Saying M to |
| 342 | both is possible but both modules should not be loaded at the same | 342 | both is possible but both modules should not be loaded at the same |