From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 31 Jan 2007 12:43:15 +0000 (-0500)
Subject: [libata] Shuffle DRV_xxx in core and SiS drivers, to kill warnings
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fda0efc5977864a90f365aeeb13f2546854e2aa9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[libata] Shuffle DRV_xxx in core and SiS drivers, to kill warnings

Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index b3091de894c2..ed11ee41673c 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -59,6 +59,9 @@
 
 #include "libata.h"
 
+#define DRV_VERSION	"2.10"	/* must be exactly four chars */
+
+
 /* debounce timing parameters in msecs { interval, duration, timeout } */
 const unsigned long sata_deb_timing_normal[]		= {   5,  100, 2000 };
 const unsigned long sata_deb_timing_hotplug[]		= {  25,  500, 2000 };
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 94eeb3d3c674..06ccf230e3c2 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -29,7 +29,6 @@
 #define __LIBATA_H__
 
 #define DRV_NAME	"libata"
-#define DRV_VERSION	"2.00"	/* must be exactly four chars */
 
 struct ata_scsi_args {
 	struct ata_device	*dev;
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 1c5219f3ffde..88ed2aad4629 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -34,6 +34,7 @@
 #include <linux/ata.h>
 #include "libata.h"
 
+#undef DRV_NAME		/* already defined in libata.h, for libata-core */
 #define DRV_NAME	"pata_sis"
 #define DRV_VERSION	"0.4.5"
 
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 7e51f1c0f7cb..4bcb94866333 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -42,6 +42,7 @@
 #include <linux/libata.h>
 #include "libata.h"
 
+#undef DRV_NAME		/* already defined in libata.h, for libata-core */
 #define DRV_NAME	"sata_sis"
 #define DRV_VERSION	"0.7"