summaryrefslogtreecommitdiffstats
path: root/drivers/net/sis900.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-07 02:06:12 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-02-07 02:06:12 -0500
commit23a56e2cbec2860ef02d6720508fbcb07accc8b4 (patch)
treea05a6b49944202b492ae492434a25f849e2616ba /drivers/net/sis900.h
parent6bd0e10e53cc4824cd8cdaab8c370e53ab2e23c2 (diff)
parent3cfc15103aa56c2c7ee6dd312c24a8d1697bade1 (diff)
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/sis900.h')
-rw-r--r--drivers/net/sis900.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sis900.h b/drivers/net/sis900.h
index 4233ea55670..50323941e3c 100644
--- a/drivers/net/sis900.h
+++ b/drivers/net/sis900.h
@@ -33,7 +33,6 @@ enum sis900_registers {
rxcfg=0x34, //Receive Configuration Register
flctrl=0x38, //Flow Control Register
rxlen=0x3c, //Receive Packet Length Register
- cfgpmcsr=0x44, //Configuration Power Management Control/Status Register
rfcr=0x48, //Receive Filter Control Register
rfdr=0x4C, //Receive Filter Data Register
pmctrl=0xB0, //Power Management Control Register