diff options
author | David S. Miller | 2011-09-22 09:23:13 +0200 |
---|---|---|
committer | David S. Miller | 2011-09-22 09:23:13 +0200 |
commit | 8decf868790b48a727d7e7ca164f2bcd3c1389c0 (patch) | |
tree | b759a5f861f842af7ea76f9011b579d06e9d5508 /include/linux/tty_driver.h | |
parent | bna: PCI Probe Conf Lock Fix (diff) | |
parent | Linux 3.1-rc7 (diff) | |
download | kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.gz kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.tar.xz kernel-qcow2-linux-8decf868790b48a727d7e7ca164f2bcd3c1389c0.zip |
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'include/linux/tty_driver.h')
-rw-r--r-- | include/linux/tty_driver.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 9deeac855240..ecdaeb98b293 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h @@ -47,6 +47,9 @@ * * This routine is called synchronously when a particular tty device * is closed for the last time freeing up the resources. + * Note that tty_shutdown() is not called if ops->shutdown is defined. + * This means one is responsible to take care of calling ops->remove (e.g. + * via tty_driver_remove_tty) and releasing tty->termios. * * * void (*cleanup)(struct tty_struct * tty); |