From 432778d7b342e62f728651d47bd2f4e477d4ffab Mon Sep 17 00:00:00 2001 From: "Marian-Nicolae V. Ion" Date: Sun, 29 May 2005 02:30:01 -0500 Subject: [PATCH] --- yaml --- r: 3527 b: refs/heads/master c: 18098a6c750d90e7bdf299fbd2144d05434a8d5a h: refs/heads/master i: 3525: 1d9ea297877156c80025a1721a24b1ac53601df7 3523: fe8d00bf589206d484303c0becc608ae746b1d90 3519: 2c06ab8bba32ea505eb047cc478d006282bc945e v: v3 --- [refs] | 2 +- trunk/drivers/input/joystick/iforce/iforce-main.c | 1 + trunk/drivers/input/joystick/iforce/iforce-usb.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c597b65f48e9..9a46e8ba364f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b1a198bf14d59b67e47dc7b133ec5ea443fb40d +refs/heads/master: 18098a6c750d90e7bdf299fbd2144d05434a8d5a diff --git a/trunk/drivers/input/joystick/iforce/iforce-main.c b/trunk/drivers/input/joystick/iforce/iforce-main.c index 028f3513629a..e31b7b93fde2 100644 --- a/trunk/drivers/input/joystick/iforce/iforce-main.c +++ b/trunk/drivers/input/joystick/iforce/iforce-main.c @@ -78,6 +78,7 @@ static struct iforce_device iforce_device[] = { { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? + { 0x06f8, 0x0004, "Gullemot Jet Leader 3D", btn_joystick, abs_joystick, ff_iforce }, //? { 0x0000, 0x0000, "Unknown I-Force Device [%04x:%04x]", btn_joystick, abs_joystick, ff_iforce } }; diff --git a/trunk/drivers/input/joystick/iforce/iforce-usb.c b/trunk/drivers/input/joystick/iforce/iforce-usb.c index 617c0b0e5a39..6369a24684fe 100644 --- a/trunk/drivers/input/joystick/iforce/iforce-usb.c +++ b/trunk/drivers/input/joystick/iforce/iforce-usb.c @@ -229,6 +229,7 @@ static struct usb_device_id iforce_usb_ids [] = { { USB_DEVICE(0x061c, 0xc0a4) }, /* ACT LABS Force RS */ { USB_DEVICE(0x06f8, 0x0001) }, /* Guillemot Race Leader Force Feedback */ { USB_DEVICE(0x06f8, 0x0004) }, /* Guillemot Force Feedback Racing Wheel */ + { USB_DEVICE(0x06f8, 0xa302) }, /* Guillemot Jet Leader 3D */ { } /* Terminating entry */ };