40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
|
From d273b1d34fe3fe7407457499aa1c0bafacae7e7e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nils Philippsen <nils@redhat.com>
|
||
|
|
Date: Wed, 4 Jan 2012 10:49:02 +0100
|
||
|
|
Subject: [PATCH] patch: Lexmark-X1100
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Squashed commit of the following:
|
||
|
|
|
||
|
|
commit 62bef64fb903a94711eb160d38eaed03ad4b27cc
|
||
|
|
Author: Stéphane Voltz <stef.dev@free.fr>
|
||
|
|
Date: Thu Jun 9 22:22:57 2011 +0200
|
||
|
|
|
||
|
|
X1100 device regression fix
|
||
|
|
(cherry picked from commit cef28b4d46a0faa4d4acb60d815ac9a49036ba85)
|
||
|
|
|
||
|
|
Conflicts:
|
||
|
|
|
||
|
|
ChangeLog
|
||
|
|
---
|
||
|
|
backend/lexmark_models.c | 1 +
|
||
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/backend/lexmark_models.c b/backend/lexmark_models.c
|
||
|
|
index 0a6d300..7819a8d 100644
|
||
|
|
--- a/backend/lexmark_models.c
|
||
|
|
+++ b/backend/lexmark_models.c
|
||
|
|
@@ -50,6 +50,7 @@ static Lexmark_Model model_list[] = {
|
||
|
|
"Lexmark X1100", /* name */
|
||
|
|
"Lexmark", /* vendor */
|
||
|
|
"X1100/rev. B2", /* model */
|
||
|
|
+ X1100_MOTOR,
|
||
|
|
/* X1100 series has 2 sensors */
|
||
|
|
X1100_B2_SENSOR,
|
||
|
|
1235, /* first x-coordinate of Home Point */
|
||
|
|
--
|
||
|
|
1.7.7.5
|
||
|
|
|