aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jazzsonic.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2005-11-02 18:15:43 +1100
commit2be7a906752abf8dce9350c23b6d1036049a5d3e (patch)
treeef178fa5801bdce24938819086662bb747d8c0c2 /drivers/net/jazzsonic.c
parentMerge iSeries include file move (diff)
parentpowerpc: include lmb.h in arch/powerpc/platforms/powermac/setup.c (diff)
downloadlinux-dev-2be7a906752abf8dce9350c23b6d1036049a5d3e.tar.xz
linux-dev-2be7a906752abf8dce9350c23b6d1036049a5d3e.zip
Merge Paulus' tree
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r--drivers/net/jazzsonic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 8423cb6875f0..a74a5cfaf5bc 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -33,7 +33,7 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <asm/bootinfo.h>