diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/char/mxser.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/char/mxser.c')
| -rw-r--r-- | drivers/char/mxser.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index f022f0944434..d0ef1ae41298 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | #include <asm/system.h> | 63 | #include <asm/system.h> |
| 64 | #include <asm/io.h> | 64 | #include <asm/io.h> |
| 65 | #include <asm/irq.h> | 65 | #include <asm/irq.h> |
| 66 | #include <asm/segment.h> | ||
| 67 | #include <asm/bitops.h> | 66 | #include <asm/bitops.h> |
| 68 | #include <asm/uaccess.h> | 67 | #include <asm/uaccess.h> |
| 69 | 68 | ||