diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 08:06:24 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 08:06:24 +0200 |
| commit | f0deb97ab13ad1f89cd0993f7339655d59788405 (patch) | |
| tree | 41572e643cb4983115707ae330b5896ae76e1ea1 /drivers/misc | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow... (diff) | |
| parent | updated Documentation/ja_JP/SubmittingPatches (diff) | |
| download | linux-f0deb97ab13ad1f89cd0993f7339655d59788405.tar.xz linux-f0deb97ab13ad1f89cd0993f7339655d59788405.zip | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
updated Documentation/ja_JP/SubmittingPatches
debugfs: add documentation for debugfs_create_x64
uio: uio_pdrv_genirq: Add OF support
firmware: gsmi: remove sysfs entries when unload the module
Documentation/zh_CN: Fix messy code file email-clients.txt
driver core: add more help description for "path to uevent helper"
driver-core: modify FIRMWARE_IN_KERNEL help message
driver-core: Kconfig grammar corrections in firmware configuration
DOCUMENTATION: Replace create_device() with device_create().
DOCUMENTATION: Update overview.txt in Doc/driver-model.
pti: pti_tty_install documentation mispelling.
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/pti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c index 374dfcfccd07..e5f295a38a34 100644 --- a/drivers/misc/pti.c +++ b/drivers/misc/pti.c @@ -445,9 +445,9 @@ static void pti_tty_driver_close(struct tty_struct *tty, struct file *filp) } /** - * pti_tty_intstall()- Used to set up specific master-channels - * to tty ports for organizational purposes when - * tracing viewed from debuging tools. + * pti_tty_install()- Used to set up specific master-channels + * to tty ports for organizational purposes when + * tracing viewed from debuging tools. * * @driver: tty driver information. * @tty: tty struct containing pti information. |