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/joystick/gamecon.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/joystick/gamecon.c')
| -rw-r--r-- | drivers/input/joystick/gamecon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index 0ffaf2c77a19..e68e49786483 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c | |||
| @@ -521,9 +521,8 @@ static void gc_multi_process_packet(struct gc *gc) | |||
| 521 | * PSX support | 521 | * PSX support |
| 522 | * | 522 | * |
| 523 | * See documentation at: | 523 | * See documentation at: |
| 524 | * http://www.dim.com/~mackys/psxmemcard/ps-eng2.txt | 524 | * http://www.geocities.co.jp/Playtown/2004/psx/ps_eng.txt |
| 525 | * http://www.gamesx.com/controldata/psxcont/psxcont.htm | 525 | * http://www.gamesx.com/controldata/psxcont/psxcont.htm |
| 526 | * ftp://milano.usal.es/pablo/ | ||
| 527 | * | 526 | * |
| 528 | */ | 527 | */ |
| 529 | 528 | ||