diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 10:01:05 -0400 |
| commit | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (patch) | |
| tree | 3c688483e71261f564fc43be3157b337ae340dca /include/net/irda/discovery.h | |
| parent | 34b2cd5b688b012975fcfc3b3970fc3508fa82c4 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/net/irda/discovery.h')
| -rw-r--r-- | include/net/irda/discovery.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/irda/discovery.h b/include/net/irda/discovery.h index e4efad1f9eff..0ce93398720d 100644 --- a/include/net/irda/discovery.h +++ b/include/net/irda/discovery.h | |||
| @@ -57,9 +57,6 @@ typedef union { | |||
| 57 | __u8 byte[2]; | 57 | __u8 byte[2]; |
| 58 | } __u16_host_order; | 58 | } __u16_host_order; |
| 59 | 59 | ||
| 60 | /* Same purpose, different application */ | ||
| 61 | #define u16ho(array) (* ((__u16 *) array)) | ||
| 62 | |||
| 63 | /* Types of discovery */ | 60 | /* Types of discovery */ |
| 64 | typedef enum { | 61 | typedef enum { |
| 65 | DISCOVERY_LOG, /* What's in our discovery log */ | 62 | DISCOVERY_LOG, /* What's in our discovery log */ |