summaryrefslogtreecommitdiff
path: root/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-03-26 07:37:31 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-03-26 07:37:31 +0000
commite5f693831422495dae93a8c8ebdf8a58b98198d7 (patch)
tree26e544c358d35a0894c223562bd42e0c9cf78934 /target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
parent7fb29fc2b9dc1aaad013fe2fe43d448d1862fb4b (diff)
downloadmtk-20170518-e5f693831422495dae93a8c8ebdf8a58b98198d7.zip
mtk-20170518-e5f693831422495dae93a8c8ebdf8a58b98198d7.tar.gz
mtk-20170518-e5f693831422495dae93a8c8ebdf8a58b98198d7.tar.bz2
Rewrite of the bootloader runtime detection (Gabor Juhos)
SVN-Revision: 6713
Diffstat (limited to 'target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c')
-rw-r--r--target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
index ddb54d4..c75ad4a 100644
--- a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
+++ b/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
@@ -20,6 +20,8 @@
#include <asm/io.h>
#include "adm5120sw.h"
+#include "adm5120_info.h"
+
MODULE_AUTHOR("Jeroen Vreeken (pe1rxq@amsat.org)");
MODULE_DESCRIPTION("ADM5120 ethernet switch driver");
MODULE_LICENSE("GPL");
@@ -316,7 +318,7 @@ static int adm5120_sw_set_mac_address(struct net_device *dev, void *p)
static int adm5120_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{
int err;
- struct adm5120_info info;
+ struct adm5120_sw_info info;
struct adm5120_sw *priv = netdev_priv(dev);
switch(cmd) {
@@ -391,7 +393,7 @@ static int __init adm5120_sw_init(void)
if (adm5120_get_reg(ADM5120_CODE) & ADM5120_CODE_PQFP)
adm5120_nrdevs = 5;
/* CFE based devices only have two enet ports */
- else if (boot_loader_type == CFE)
+ else if (adm5120_info.boot_loader == BOOT_LOADER_CFE)
adm5120_nrdevs = 2;
else
adm5120_nrdevs = 6;