diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/mouse/touchkit_ps2.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/mouse/touchkit_ps2.c')
| -rw-r--r-- | drivers/input/mouse/touchkit_ps2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c index 88121c59c3cc..1fd8f5e192f9 100644 --- a/drivers/input/mouse/touchkit_ps2.c +++ b/drivers/input/mouse/touchkit_ps2.c | |||
| @@ -21,8 +21,8 @@ | |||
| 21 | * | 21 | * |
| 22 | * Based upon touchkitusb.c | 22 | * Based upon touchkitusb.c |
| 23 | * | 23 | * |
| 24 | * Vendor documentation is available in support section of: | 24 | * Vendor documentation is available at: |
| 25 | * http://www.egalax.com.tw/ | 25 | * http://home.eeti.com.tw/web20/drivers/Software%20Programming%20Guide_v2.0.pdf |
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |