diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/net/ax25.h | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/net/ax25.h')
| -rw-r--r-- | include/net/ax25.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h index 5bd997487054..7cd528e9d668 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #ifndef _AX25_H | 6 | #ifndef _AX25_H |
| 7 | #define _AX25_H | 7 | #define _AX25_H |
| 8 | 8 | ||
| 9 | #include <linux/config.h> | ||
| 10 | #include <linux/ax25.h> | 9 | #include <linux/ax25.h> |
| 11 | #include <linux/spinlock.h> | 10 | #include <linux/spinlock.h> |
| 12 | #include <linux/timer.h> | 11 | #include <linux/timer.h> |