diff --git a/[refs] b/[refs] index fc4c2a98e33c..5af30e90e0c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bfac9ecf0585962fe13584f5cf526d8c8e76f17 +refs/heads/master: f786ddd285b4100909a013041d3eee1be9fac4db diff --git a/trunk/include/linux/tty_driver.h b/trunk/include/linux/tty_driver.h index 8615d661ab60..bcba84ea2d86 100644 --- a/trunk/include/linux/tty_driver.h +++ b/trunk/include/linux/tty_driver.h @@ -309,7 +309,8 @@ extern void tty_set_operations(struct tty_driver *driver, extern struct tty_driver *tty_find_polling_driver(char *name, int *line); extern void tty_driver_kref_put(struct tty_driver *driver); -extern inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d) + +static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d) { kref_get(&d->kref); return d;