Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / staging / rtl8192e / r8180_93cx6.h

diff --git a/drivers/staging/rtl8192e/r8180_93cx6.h b/drivers/staging/rtl8192e/r8180_93cx6.h
index 4c3f675c6a662f5aaa96fc997de8953c8a15b5d6..55d20544a9c9ae85e0ba94f09dcf85bf11c00a0d 100644 (file)
--- a/drivers/staging/rtl8192e/r8180_93cx6.h
+++ b/drivers/staging/rtl8192e/r8180_93cx6.h
@@ -38,4 +38,4 @@
 #define EPROM_TXPW1 0x3d
 
 /* Reads a 16 bits word. */
-u32 eprom_read(struct net_device *dev, u32 addr);
+u32 eprom_read(struct r8192_priv *priv, u32 addr);