Changeset 983cabe8 in mainline for uspace/srv/hid/input/port/pl050.c


Ignore:
Timestamp:
2012-09-04T21:22:44Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
239acce
Parents:
c33f39f (diff), 3ffd4c3 (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/port/pl050.c

    rc33f39f r983cabe8  
    4141#include <unistd.h>
    4242#include <sysinfo.h>
    43 #include <kbd_port.h>
    44 #include <kbd.h>
    4543#include <ddi.h>
    4644#include <stdio.h>
    4745#include <errno.h>
     46#include "../kbd_port.h"
     47#include "../kbd.h"
    4848
    4949static int pl050_port_init(kbd_dev_t *);
Note: See TracChangeset for help on using the changeset viewer.