summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 13:06:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 13:06:25 -0700
commit4afb93b4211b3f65ebd8ea0d9018426dd9e8693e (patch)
treeff1ed561413f38b818514559f7efb223189640f1 /drivers
parent225aa01173b271a3802b716e14176eb7d11dcce4 (diff)
parentf7512e7c4bb557b784fd5326f78983a7dea9949c (diff)
downloadlinux-3.10-4afb93b4211b3f65ebd8ea0d9018426dd9e8693e.tar.gz
linux-3.10-4afb93b4211b3f65ebd8ea0d9018426dd9e8693e.tar.bz2
linux-3.10-4afb93b4211b3f65ebd8ea0d9018426dd9e8693e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: fix rs485 for atmel_serial on avr32
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/atmel_serial.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index eed3c2d8dd1..a182def7007 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -41,6 +41,7 @@
#include <linux/uaccess.h>
#include <asm/io.h>
+#include <asm/ioctls.h>
#include <asm/mach/serial_at91.h>
#include <mach/board.h>