diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-06 02:14:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-06 02:14:40 -0700 |
commit | 7d95b6c73a642382b7ca0ee88dacdcdecc7432cb (patch) | |
tree | de1592a7c17d89310504be4c22b27e38ae1aa2c5 /drivers | |
parent | 2f8269daa5c2395774a656174740dd95fdd6639b (diff) | |
parent | be7650a8a296f71808c4abbc9b9559a1e77c0168 (diff) | |
download | history-7d95b6c73a642382b7ca0ee88dacdcdecc7432cb.tar.gz |
Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/serial/8250_pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 8639c7dd0e786a..34b367778dc943 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c @@ -574,8 +574,7 @@ titan_400l_800l_setup(struct pci_dev *dev, struct pci_board *board, static int __devinit pci_xircom_init(struct pci_dev *dev) { - __set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ/10); + msleep(100); return 0; } |