aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips/files/include/asm-mips
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-06-23 20:31:34 +0000
committerJohn Crispin <john@openwrt.org>2008-06-23 20:31:34 +0000
commit6e266198e9034d322b7afdc326a74ed6ad25c1df (patch)
tree3ac89d6837288b26a794bed8ca202b411f9d054e /target/linux/ifxmips/files/include/asm-mips
parent81af6da03766b83a47347e7509fd6e6829ac8569 (diff)
downloadupstream-6e266198e9034d322b7afdc326a74ed6ad25c1df.tar.gz
upstream-6e266198e9034d322b7afdc326a74ed6ad25c1df.tar.bz2
upstream-6e266198e9034d322b7afdc326a74ed6ad25c1df.zip
lots of code cleanup for ifxmips
SVN-Revision: 11570
Diffstat (limited to 'target/linux/ifxmips/files/include/asm-mips')
-rw-r--r--target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h2
-rw-r--r--target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mei_linux.h3
-rw-r--r--target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mii0.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h
index 8b2bae6759..6c9f59e0f6 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_irq.h
@@ -64,6 +64,6 @@
#define IFXMIPS_DMA_CH18_INT (INT_NUM_IM2_IRL0 + 16)
#define IFXMIPS_DMA_CH19_INT (INT_NUM_IM2_IRL0 + 21)
-extern void mask_and_ack_ifxmips_irq (unsigned int irq_nr);
+extern void ifxmips_mask_and_ack_irq(unsigned int irq_nr);
#endif
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mei_linux.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mei_linux.h
index b1c12d1d01..79849ae4fb 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mei_linux.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mei_linux.h
@@ -60,6 +60,7 @@
#include <asm/ifxmips/ifxmips_mei_app_ioctl.h>
#include <asm/ifxmips/ifxmips_gpio.h>
#include <asm/ifxmips/ifxmips_led.h>
+#include <asm/ifxmips/ifxmips_irq.h>
#ifdef CONFIG_DEVFS_FS
#define IFXMIPS_DEVNAME "ifxmips"
@@ -79,7 +80,7 @@
up(&id)
#define MEI_MASK_AND_ACK_IRQ \
- mask_and_ack_ifxmips_irq
+ ifxmips_mask_and_ack_irq
#define MEI_DISABLE_IRQ \
disable_irq
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mii0.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mii0.h
index a42b0e79f2..0402d725f5 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mii0.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_mii0.h
@@ -229,7 +229,7 @@ enum duplex
autoneg
};
-struct switch_priv {
+struct ifxmips_mii_priv {
struct net_device_stats stats;
int rx_packetlen;
u8 *rx_packetdata;