--- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -763,7 +763,11 @@ static int rfcomm_tty_write_room(struct return room; } +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) +#else +static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) +#endif { BT_DBG("tty %p cmd 0x%02x", tty, cmd); @@ -1016,7 +1020,11 @@ static void rfcomm_tty_hangup(struct tty tty_port_put(&dev->port); } +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) static int rfcomm_tty_tiocmget(struct tty_struct *tty) +#else +static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp) +#endif { struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; @@ -1025,7 +1033,11 @@ static int rfcomm_tty_tiocmget(struct tt return dev->modem_status; } +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) +#else +static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsigned int set, unsigned int clear) +#endif { struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; struct rfcomm_dlc *dlc = dev->dlc;