[2.6 patch] SCSI gdth: kill #define __devinitdata

From: Adrian Bunk
Date: Mon Aug 09 2004 - 14:49:15 EST


I got the following warning in 2.6.8-rc3-mm2:

<-- snip -->

...
CC drivers/scsi/gdth.o
drivers/scsi/gdth.c:622:1: warning: "__devinitdata" redefined
In file included from include/linux/moduleparam.h:4,
from include/linux/module.h:20,
from drivers/scsi/gdth.c:375:
include/linux/init.h:227:1: warning: this is the location of the
previous definition
...

<-- snip -->


The #define in question seems bogus, and the following patch simply
removes it:


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.8-rc3-mm2-full-3.4/drivers/scsi/gdth.c.old 2004-08-09 20:59:07.000000000 +0200
+++ linux-2.6.8-rc3-mm2-full-3.4/drivers/scsi/gdth.c 2004-08-09 21:03:02.000000000 +0200
@@ -618,9 +618,6 @@
};

/* __initfunc, __initdata macros */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#define __devinitdata
-#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
#define GDTH_INITFUNC(type, func) type __init func
#include <linux/init.h>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/