Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
60295662
Commit
60295662
authored
Dec 26, 2004
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge pobox.com:/garz/repo/netdev-2.6/misc
into pobox.com:/garz/repo/net-drivers-2.6
parents
96e0ee07
402ac464
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
24 deletions
+27
-24
drivers/net/Kconfig
drivers/net/Kconfig
+22
-21
drivers/net/sis900.c
drivers/net/sis900.c
+5
-3
No files found.
drivers/net/Kconfig
View file @
60295662
...
...
@@ -1179,37 +1179,38 @@ config IBMVETH
be called ibmveth.
config IBM_EMAC
tristate "IBM PPC4xx EMAC driver support"
depends on 4xx
---help---
This driver supports the IBM PPC4xx EMAC family of on-chip
Ethernet controllers.
tristate "IBM PPC4xx EMAC driver support"
depends on 4xx
select CRC32
---help---
This driver supports the IBM PPC4xx EMAC family of on-chip
Ethernet controllers.
config IBM_EMAC_ERRMSG
bool "Verbose error messages"
depends on IBM_EMAC
bool "Verbose error messages"
depends on IBM_EMAC
config IBM_EMAC_RXB
int "Number of receive buffers"
depends on IBM_EMAC
default "128" if IBM_EMAC4
default "64"
int "Number of receive buffers"
depends on IBM_EMAC
default "128" if IBM_EMAC4
default "64"
config IBM_EMAC_TXB
int "Number of transmit buffers"
depends on IBM_EMAC
default "128" if IBM_EMAC4
default "8"
int "Number of transmit buffers"
depends on IBM_EMAC
default "128" if IBM_EMAC4
default "8"
config IBM_EMAC_FGAP
int "Frame gap"
depends on IBM_EMAC
default "8"
int "Frame gap"
depends on IBM_EMAC
default "8"
config IBM_EMAC_SKBRES
int "Skb reserve amount"
depends on IBM_EMAC
default "0"
int "Skb reserve amount"
depends on IBM_EMAC
default "0"
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
...
...
drivers/net/sis900.c
View file @
60295662
...
...
@@ -48,6 +48,7 @@
*/
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
...
...
@@ -120,6 +121,7 @@ static struct mii_chip_info {
}
mii_chip_table
[]
=
{
{
"SiS 900 Internal MII PHY"
,
0x001d
,
0x8000
,
LAN
},
{
"SiS 7014 Physical Layer Solution"
,
0x0016
,
0xf830
,
LAN
},
{
"Altimata AC101LF PHY"
,
0x0022
,
0x5520
,
LAN
},
{
"AMD 79C901 10BASE-T PHY"
,
0x0000
,
0x6B70
,
LAN
},
{
"AMD 79C901 HomePNA PHY"
,
0x0000
,
0x6B90
,
HOME
},
{
"ICS LAN PHY"
,
0x0015
,
0xF440
,
LAN
},
...
...
@@ -178,9 +180,9 @@ MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>");
MODULE_DESCRIPTION
(
"SiS 900 PCI Fast Ethernet driver"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_PARM
(
multicast_filter_limit
,
"i"
);
MODULE_PARM
(
max_interrupt_work
,
"i"
);
MODULE_PARM
(
debug
,
"i"
);
module_param
(
multicast_filter_limit
,
int
,
0444
);
module_param
(
max_interrupt_work
,
int
,
0444
);
module_param
(
debug
,
int
,
0444
);
MODULE_PARM_DESC
(
multicast_filter_limit
,
"SiS 900/7016 maximum number of filtered multicast addresses"
);
MODULE_PARM_DESC
(
max_interrupt_work
,
"SiS 900/7016 maximum events handled per interrupt"
);
MODULE_PARM_DESC
(
debug
,
"SiS 900/7016 debug level (2-4)"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment