diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
| commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
| tree | 972993c6568085b8d407fc7e13de10f4b93c651d /drivers/net/appletalk/ltpc.c | |
| parent | Input: synaptics - fix regression with "image sensor" trackpads (diff) | |
| parent | Input: matrix-keymap - fix building keymaps (diff) | |
| download | linux-e644dae645e167d154c0526358940986682a72b0.tar.xz linux-e644dae645e167d154c0526358940986682a72b0.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/net/appletalk/ltpc.c')
| -rw-r--r-- | drivers/net/appletalk/ltpc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 6057b30417a2..0910dce3996d 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c @@ -229,7 +229,6 @@ static int dma; #include <linux/bitops.h> #include <linux/gfp.h> -#include <asm/system.h> #include <asm/dma.h> #include <asm/io.h> |