diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 12:17:25 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-12-09 12:17:25 -0500 |
| commit | d834a9dcecae834cd6b2bc5e50e1907738d9cf6a (patch) | |
| tree | 0589d753465d3fe359ba451ba6cb7798df03aaa2 /net/sctp/inqueue.c | |
| parent | a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 (diff) | |
| parent | f658bcfb2607bf0808966a69cf74135ce98e5c2d (diff) | |
Merge branch 'x86/amd-nb' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/sctp/inqueue.c')
| -rw-r--r-- | net/sctp/inqueue.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c index ccb6dc48d15b..397296fb156f 100644 --- a/net/sctp/inqueue.c +++ b/net/sctp/inqueue.c | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | * be incorporated into the next SCTP release. | 43 | * be incorporated into the next SCTP release. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
| 47 | |||
| 46 | #include <net/sctp/sctp.h> | 48 | #include <net/sctp/sctp.h> |
| 47 | #include <net/sctp/sm.h> | 49 | #include <net/sctp/sm.h> |
| 48 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |