diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 22:29:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 22:29:02 +0100 |
| commit | 874ff01bd9183ad16495acfd54e93a619d12b8b5 (patch) | |
| tree | e9527e94649fadfa705dae64018e027e51681b88 /drivers/i2c/busses/i2c-ali15x3.c | |
| parent | Merge branch 'kill-jffs' of master.kernel.org:/pub/scm/linux/kernel/git/jgarz... (diff) | |
| parent | Documentation/kernel-docs.txt update. (diff) | |
| download | linux-874ff01bd9183ad16495acfd54e93a619d12b8b5.tar.xz linux-874ff01bd9183ad16495acfd54e93a619d12b8b5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
Documentation/kernel-docs.txt update.
arch/cris: typo in KERN_INFO
Storage class should be before const qualifier
kernel/printk.c: comment fix
update I/O sched Kconfig help texts - CFQ is now default, not AS.
Remove duplicate listing of Cris arch from README
kbuild: more doc. cleanups
doc: make doc. for maxcpus= more visible
drivers/net/eexpress.c: remove duplicate comment
add a help text for BLK_DEV_GENERIC
correct a dead URL in the IP_MULTICAST help text
fix the BAYCOM_SER_HDX help text
fix SCSI_SCAN_ASYNC help text
trivial documentation patch for platform.txt
Fix typos concerning hierarchy
Fix comment typo "spin_lock_irqrestore".
Fix misspellings of "agressive".
drivers/scsi/a100u2w.c: trivial typo patch
Correct trivial typo in log2.h.
Remove useless FIND_FIRST_BIT() macro from cardbus.c.
...
Diffstat (limited to 'drivers/i2c/busses/i2c-ali15x3.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index e4e0df106812..e47fe01bf42a 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c @@ -489,7 +489,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_ return -ENODEV; } - /* set up the driverfs linkage to our parent device */ + /* set up the sysfs linkage to our parent device */ ali15x3_adapter.dev.parent = &dev->dev; snprintf(ali15x3_adapter.name, I2C_NAME_SIZE, |