[PATCH] make irtty.c compile again

irtty.c includes irqueue.h which includes linux/cache.h (via
asm/processor.h <- asm/thread_info.h <- linux/thread_info.h <-
linux/spinlock.h)

both irqueue.h and cache.h defines a ALIGN (for different
purposes).

This patch renames ALIGN in irqueue.h to IRDA_ALIGN.

diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index 42a0c802c70a9ae127a448f6a0e091c273bc82e9..6f89d5df801a7722f383761a85ea0ecd86c93a21 100644 (file)
--- a/include/net/irda/irda.h
+++ b/include/net/irda/irda.h
@@ -54,8 +54,8 @@ typedef __u32 magic_t;
 #define IRDA_MIN(a, b) (((a) < (b)) ? (a) : (b))
 #endif
 
-#ifndef ALIGN
-#  define ALIGN __attribute__((aligned))
+#ifndef IRDA_ALIGN
+#  define IRDA_ALIGN __attribute__((aligned))
 #endif
 #ifndef PACK
 #  define PACK __attribute__((packed))

diff --git a/include/net/irda/irqueue.h b/include/net/irda/irqueue.h
index f7c1ba65971ceaf2f1b1a24f66239899387083f0..6394397ac8877db67a8b191d4410d5c5b4edde13 100644 (file)
--- a/include/net/irda/irqueue.h
+++ b/include/net/irda/irqueue.h
@@ -49,8 +49,8 @@
 #define HASHBIN_SIZE   8
 #define HASHBIN_MASK   0x7
 
-#ifndef ALIGN 
-#define ALIGN __attribute__((aligned))
+#ifndef IRDA_ALIGN 
+#define IRDA_ALIGN __attribute__((aligned))
 #endif
 
 #define Q_NULL { NULL, NULL, "", 0 }
@@ -75,8 +75,8 @@ typedef struct hashbin_t {
        __u32      magic;
        int        hb_type;
        int        hb_size;
-       spinlock_t hb_mutex[HASHBIN_SIZE] ALIGN;
-       irda_queue_t   *hb_queue[HASHBIN_SIZE] ALIGN;
+       spinlock_t hb_mutex[HASHBIN_SIZE] IRDA_ALIGN;
+       irda_queue_t   *hb_queue[HASHBIN_SIZE] IRDA_ALIGN;
 
        irda_queue_t* hb_current;
 } hashbin_t;