Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/input/include/kbd_port.h

    r3842a955 r26e7d6d  
    2828
    2929/** @addtogroup inputgen generic
    30  * @brief       Keyboard port driver interface.
    31  * @ingroup  input
     30 * @brief Keyboard port driver interface.
     31 * @ingroup input
    3232 * @{
    3333 */
     
    5151extern kbd_port_ops_t adb_port;
    5252extern kbd_port_ops_t chardev_port;
    53 extern kbd_port_ops_t dummy_port;
    5453extern kbd_port_ops_t gxemul_port;
    5554extern kbd_port_ops_t msim_port;
     
    5756extern kbd_port_ops_t ns16550_port;
    5857extern kbd_port_ops_t pl050_port;
    59 extern kbd_port_ops_t sgcn_port;
    6058extern kbd_port_ops_t ski_port;
    61 extern kbd_port_ops_t z8530_port;
    6259
    6360#endif
     
    6562/**
    6663 * @}
    67  */
    68 
     64 */
Note: See TracChangeset for help on using the changeset viewer.