Ignore:
Timestamp:
2011-12-22T12:04:54Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3819ce5
Parents:
65d7b0a (diff), a438de4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

    r65d7b0a r1440eae  
    194194        async_set_interrupt_received(s3c24xx_uart_irq_handler);
    195195
    196         register_irq(inr, device_assign_devno(), 0, &uart_irq_code);
     196        irq_register(inr, device_assign_devno(), 0, &uart_irq_code);
    197197
    198198        /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */
Note: See TracChangeset for help on using the changeset viewer.