diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 16:06:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-26 16:06:25 -0400 |
| commit | 4afb93b4211b3f65ebd8ea0d9018426dd9e8693e (patch) | |
| tree | ff1ed561413f38b818514559f7efb223189640f1 /drivers | |
| parent | 225aa01173b271a3802b716e14176eb7d11dcce4 (diff) | |
| parent | f7512e7c4bb557b784fd5326f78983a7dea9949c (diff) | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c index eed3c2d8dd1c..a182def7007d 100644 --- a/drivers/serial/atmel_serial.c +++ b/drivers/serial/atmel_serial.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/uaccess.h> | 41 | #include <linux/uaccess.h> |
| 42 | 42 | ||
| 43 | #include <asm/io.h> | 43 | #include <asm/io.h> |
| 44 | #include <asm/ioctls.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/mach/serial_at91.h> | 46 | #include <asm/mach/serial_at91.h> |
| 46 | #include <mach/board.h> | 47 | #include <mach/board.h> |