Commit 1bc8f69a authored by Anders Gustafsson's avatar Anders Gustafsson Committed by Linus Torvalds

[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.
parent 3eafd8a0
...@@ -54,8 +54,8 @@ typedef __u32 magic_t; ...@@ -54,8 +54,8 @@ typedef __u32 magic_t;
#define IRDA_MIN(a, b) (((a) < (b)) ? (a) : (b)) #define IRDA_MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif #endif
#ifndef ALIGN #ifndef IRDA_ALIGN
# define ALIGN __attribute__((aligned)) # define IRDA_ALIGN __attribute__((aligned))
#endif #endif
#ifndef PACK #ifndef PACK
# define PACK __attribute__((packed)) # define PACK __attribute__((packed))
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
#define HASHBIN_SIZE 8 #define HASHBIN_SIZE 8
#define HASHBIN_MASK 0x7 #define HASHBIN_MASK 0x7
#ifndef ALIGN #ifndef IRDA_ALIGN
#define ALIGN __attribute__((aligned)) #define IRDA_ALIGN __attribute__((aligned))
#endif #endif
#define Q_NULL { NULL, NULL, "", 0 } #define Q_NULL { NULL, NULL, "", 0 }
...@@ -75,8 +75,8 @@ typedef struct hashbin_t { ...@@ -75,8 +75,8 @@ typedef struct hashbin_t {
__u32 magic; __u32 magic;
int hb_type; int hb_type;
int hb_size; int hb_size;
spinlock_t hb_mutex[HASHBIN_SIZE] ALIGN; spinlock_t hb_mutex[HASHBIN_SIZE] IRDA_ALIGN;
irda_queue_t *hb_queue[HASHBIN_SIZE] ALIGN; irda_queue_t *hb_queue[HASHBIN_SIZE] IRDA_ALIGN;
irda_queue_t* hb_current; irda_queue_t* hb_current;
} hashbin_t; } hashbin_t;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment