diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/char/pcmcia | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/char/pcmcia')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/tty.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c index b1414507997c..3a23e7694d55 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/char/pcmcia/ipwireless/tty.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/tty_driver.h> | 29 | #include <linux/tty_driver.h> |
| 30 | #include <linux/tty_flip.h> | 30 | #include <linux/tty_flip.h> |
| 31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
| 32 | #include <linux/version.h> | ||
| 33 | 32 | ||
| 34 | #include "tty.h" | 33 | #include "tty.h" |
| 35 | #include "network.h" | 34 | #include "network.h" |