diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 21:27:45 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 21:27:45 (GMT) |
commit | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (patch) | |
tree | 821382d49e47c19531bfc3bb9e1f8922486374d4 /drivers/net/dnet.c | |
parent | 93394a761d78503f11d05b1a7b23d5a9ccc8dad2 (diff) | |
parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
download | linux-3fab191002b184e4390aa07c7149c6cc7b638ec7.tar.xz |
Merge branch 'linus' into x86/core
Diffstat (limited to 'drivers/net/dnet.c')
-rw-r--r-- | drivers/net/dnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c index 1b40632..db1e31f 100644 --- a/drivers/net/dnet.c +++ b/drivers/net/dnet.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ #include <linux/version.h> +#include <linux/io.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/kernel.h> @@ -21,7 +22,6 @@ #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/phy.h> -#include <linux/platform_device.h> #include "dnet.h" |