diff --git a/[refs] b/[refs] index 7c0466a5b6bf..5a26095a8e85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f3b795a626ee79574595e06d1437fe0c7d51d29 +refs/heads/master: 6e9430ac57e8c1f41ab24ef7fbb3d452c7eb7246 diff --git a/trunk/drivers/tty/tty_io.c b/trunk/drivers/tty/tty_io.c index da9fde850754..6b20fd66d4ad 100644 --- a/trunk/drivers/tty/tty_io.c +++ b/trunk/drivers/tty/tty_io.c @@ -2906,9 +2906,9 @@ void do_SAK(struct tty_struct *tty) EXPORT_SYMBOL(do_SAK); -static int dev_match_devt(struct device *dev, void *data) +static int dev_match_devt(struct device *dev, const void *data) { - dev_t *devt = data; + const dev_t *devt = data; return dev->devt == *devt; }