[Linuxwacom-devel] [PATCH 2/3] Fix compile issues with older drivers

[Jason G. <kil...@gm...>]

* Add missing semicolon to 0x4004 definition (2.6.38)
* Remove duplicate device definition (2.6.30)
* Add missing closing brace (2.6.30)

Signed-off-by: Jason Gerecke <kil...@gm...>
---
 2.6.30/wacom_wac.c | 3 +--
 2.6.38/wacom_wac.c | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 28eb0ca..c3ffaea 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1967,7 +1967,6 @@ static const struct wacom_features wacom_features_0xF4 =
 	{ "Wacom Cintiq 24HD",       WACOM_PKGLEN_INTUOS, 104280, 65400, 2047, 63, WACOM_24HD, 200, 200 };
 static const struct wacom_features wacom_features_0xF8 =
 	{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104280, 65400, 2047, 63, WACOM_24HD, 200, 200 };
-	{ "Wacom Cintiq 24HD touch", WACOM_PKGLEN_INTUOS, 104480, 65600, 2047, 63, WACOM_24HD };
 static const struct wacom_features wacom_features_0x3F =
 	{ "Wacom Cintiq 21UX",    WACOM_PKGLEN_INTUOS,    87200, 65600, 1023, 63, CINTIQ };
 static const struct wacom_features wacom_features_0xC5 =
@@ -1987,7 +1986,7 @@ static const struct wacom_features wacom_features_0xFB =
 static const struct wacom_features wacom_features_0x57 =
 	{ "Wacom DTK2241",        WACOM_PKGLEN_INTUOS,    95640, 54060, 2047, 63, DTK, 200, 200 };
 static const struct wacom_features wacom_features_0x59 =
-	{ "Wacom DTH2242",        WACOM_PKGLEN_INTUOS,    95640, 54060, 2047, 63, DTK, 200, 200,
+	{ "Wacom DTH2242",        WACOM_PKGLEN_INTUOS,    95640, 54060, 2047, 63, DTK, 200, 200 };
 static const struct wacom_features wacom_features_0xCC =
 	{ "Wacom Cintiq 21UX2",   WACOM_PKGLEN_INTUOS,    87000, 65400, 2047, 63, WACOM_21UX2, 200, 200 };
 static const struct wacom_features wacom_features_0xFA =
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index f0189ae..40c4d69 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -2305,7 +2305,7 @@ static const struct wacom_features wacom_features_0x4001 =
 	  0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x4004 =
 	{ "Wacom ISDv4 4004",      WACOM_PKGLEN_MTTPC,     11060, 6220,  255,
-	  0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES }
+	  0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
 static const struct wacom_features wacom_features_0x5000 =
 	{ "Wacom ISDv4 5000",      WACOM_PKGLEN_MTTPC,     27848, 15752,  1023,
 	  0, MTTPC_B, WACOM_INTUOS_RES, WACOM_INTUOS_RES };
-- 
2.1.1