Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Gustafsson <andersg@0x63.nu>2002-03-07 00:38:51 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-03-07 00:38:51 -0800
commit1bc8f69a5a7ac7024cfa61a9ac16db910f8c9cde (patch)
treeff7cf60eb4dcaf061c5e65d43db2f1ea27b710e0
parent3eafd8a0638b90e564568d9f1858adeabc9c5297 (diff)
[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.
-rw-r--r--include/net/irda/irda.h4
-rw-r--r--include/net/irda/irqueue.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h
index 42a0c802c70a..6f89d5df801a 100644
--- 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 f7c1ba65971c..6394397ac887 100644
--- 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;