[patch] 2.6.10-rc2-mm2: `ST_partstat' multiple definition

[Adrian Bunk]

The following compile error is still present:

<--  snip  -->

...
  LD      drivers/scsi/built-in.o
drivers/scsi/osst.o(.bss+0x0): multiple definition of `ST_partstat'
drivers/scsi/st.o(.bss+0x0): first defined here
make[2]: *** [drivers/scsi/built-in.o] Error 1

<--  snip  -->


The patch below fixes this issue.


It is also present in 2.6.10-rc2. Please put it therefore on your 
must-go-to-linus-before-2.6.10-or-the-world-will-stop-turning list.


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

--- linux-2.6.10-rc2-mm2-full/drivers/scsi/st.h.old	2004-11-18 22:49:28.000000000 +0100
+++ linux-2.6.10-rc2-mm2-full/drivers/scsi/st.h	2004-11-18 22:49:48.000000000 +0100
@@ -67,7 +67,7 @@
 	u32 last_block_visited;
 	int drv_block;		/* The block where the drive head is */
 	int drv_file;
-} ST_partstat;
+};
 
 #define ST_NBR_PARTITIONS 4
 

-
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/