[S390] non-unique constant/macro identifiers.

Add some prefixes to constands defined in drivers/s390/net/qdio.h
and drivers/s390/lcs.h to make it possible to include the three
header files drivers/s390/net/qeth.h, drivers/s390/net/qdio.h and
drivers/net/s390/lcs.h in one C file. This is required for the
patch that generates the kerntypes.o file for use by lcrash.

Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index b5247dc08b57..0e1e4a0a88f0 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -23,11 +23,6 @@ do {                                       \
 } while (0)
 
 /**
- * some more definitions for debug or output stuff
- */
-#define PRINTK_HEADER           " lcs: "
-
-/**
  *      sysfs related stuff
  */
 #define CARD_FROM_DEV(cdev) \
@@ -127,22 +122,22 @@ do {                                       \
  * LCS Buffer states
  */
 enum lcs_buffer_states {
-        BUF_STATE_EMPTY,        /* buffer is empty */
-        BUF_STATE_LOCKED,       /* buffer is locked, don't touch */
-        BUF_STATE_READY,        /* buffer is ready for read/write */
-        BUF_STATE_PROCESSED,
+        LCS_BUF_STATE_EMPTY,    /* buffer is empty */
+        LCS_BUF_STATE_LOCKED,   /* buffer is locked, don't touch */
+        LCS_BUF_STATE_READY,    /* buffer is ready for read/write */
+        LCS_BUF_STATE_PROCESSED,
 };
 
 /**
  * LCS Channel State Machine declarations
  */
 enum lcs_channel_states {
-        CH_STATE_INIT,
-        CH_STATE_HALTED,
-        CH_STATE_STOPPED,
-        CH_STATE_RUNNING,
-        CH_STATE_SUSPENDED,
-        CH_STATE_CLEARED,
+        LCS_CH_STATE_INIT,
+        LCS_CH_STATE_HALTED,
+        LCS_CH_STATE_STOPPED,
+        LCS_CH_STATE_RUNNING,
+        LCS_CH_STATE_SUSPENDED,
+        LCS_CH_STATE_CLEARED,
 };
 
 /**