diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-13 16:57:17 +1100 |
| commit | c06ab71e9852d00150f82a26bcdfa5657911a9c5 (patch) | |
| tree | a186847292d74610f5f07035837877b39b1fa5fb /drivers/serial/mcfserial.c | |
| parent | 26a9fe3d937ea501f9c0c100a1b0f159551fd963 (diff) | |
| parent | 6fcc0ef3af13bcdb603250755b916e423ce4b065 (diff) | |
Merge commit 'semaphore/semaphore'
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/base/core.c
drivers/firewire/fw-device.c
Diffstat (limited to 'drivers/serial/mcfserial.c')
| -rw-r--r-- | drivers/serial/mcfserial.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c index 99af084c7cec..ddd3aa50d4ad 100644 --- a/drivers/serial/mcfserial.c +++ b/drivers/serial/mcfserial.c @@ -40,7 +40,6 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> -#include <asm/semaphore.h> #include <asm/delay.h> #include <asm/coldfire.h> #include <asm/mcfsim.h> |