diff options
author | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-10 16:51:29 +1100 |
commit | d6d93856cb90eeb07062ad938bd26f554bf1b9b9 (patch) | |
tree | eeec5011a42f38d3dfe7b61788b7ac1cc890edeb /drivers/net/sis900.h | |
parent | 8f75015f33c3005e0bbf83ffc0d5e0b4262cc03d (diff) | |
parent | ad71f123a9e9b809f6c829db1222ce0423a1153c (diff) | |
download | kernel-crypto-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.gz kernel-crypto-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.tar.xz kernel-crypto-d6d93856cb90eeb07062ad938bd26f554bf1b9b9.zip |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/net/sis900.h')
-rw-r--r-- | drivers/net/sis900.h | 1 |
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 |