git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
drivers
/
serial
/
8250_acpi.c
diff --git
a/drivers/serial/8250_acpi.c
b/drivers/serial/8250_acpi.c
index
99ff672
..
ec25d59
100644
(file)
--- a/
drivers/serial/8250_acpi.c
+++ b/
drivers/serial/8250_acpi.c
@@
-123,7
+123,7
@@
static int acpi_serial_add(struct acpi_device *device)
}
serial_req.baud_base = BASE_BAUD;
- serial_req.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF
| UPF_RESOURCES
;
+ serial_req.flags = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
priv->line = register_serial(&serial_req);
if (priv->line < 0) {