diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
| commit | edc72786d208e77db94f84dcb0d166c0d23d82f7 (patch) | |
| tree | 6fd32770f9cb2f1a888775514294d60aecba5245 /drivers/net/tokenring/ibmtr.c | |
| parent | 6a5e293f1b34920c69a932ce37b4a4714a428dc7 (diff) | |
| parent | 4367216a099b4df3fa2c4f2b086cda1a1e9afc4e (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/net/tokenring/ibmtr.c')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 525bbc5b9c9d..36cb2423bcf1 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -108,6 +108,7 @@ in the event that chatty debug messages are desired - jjs 12/30/98 */ | |||
| 108 | #define IBMTR_DEBUG_MESSAGES 0 | 108 | #define IBMTR_DEBUG_MESSAGES 0 |
| 109 | 109 | ||
| 110 | #include <linux/module.h> | 110 | #include <linux/module.h> |
| 111 | #include <linux/sched.h> | ||
| 111 | 112 | ||
| 112 | #ifdef PCMCIA /* required for ibmtr_cs.c to build */ | 113 | #ifdef PCMCIA /* required for ibmtr_cs.c to build */ |
| 113 | #undef MODULE /* yes, really */ | 114 | #undef MODULE /* yes, really */ |