diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/max3100.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/max3100.c')
| -rw-r--r-- | drivers/serial/max3100.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c index 3c30c56aa2e1..3351c3bd59e4 100644 --- a/drivers/serial/max3100.c +++ b/drivers/serial/max3100.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #define MAX_MAX3100 4 | 41 | #define MAX_MAX3100 4 |
| 42 | 42 | ||
| 43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include <linux/device.h> | 45 | #include <linux/device.h> |
| 45 | #include <linux/serial_core.h> | 46 | #include <linux/serial_core.h> |
| 46 | #include <linux/serial.h> | 47 | #include <linux/serial.h> |