Merge pobox.com:/garz/repo/netdev-2.6/sis900

into pobox.com:/garz/repo/net-drivers-2.6

diff --cc drivers/net/sis900.c
index 7bb0e9019d3c8c986a61996a41972badd8b29db5,58dbd66d3fb74cca702d14475a8da155c186b0fb..ead97f46889ca57fd1b2407a64ba2dcffb1707f4
--- 1/drivers/net/sis900.c
--- 2/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@@ -170,8 -170,9 +170,8 @@@ struct sis900_private 
        dma_addr_t tx_ring_dma;
        dma_addr_t rx_ring_dma;
  
-       unsigned int tx_full;                   /* The Tx queue is full.    */
+       unsigned int tx_full; /* The Tx queue is full. */
        u8 host_bridge_rev;
 -      u32 pci_state[16];
  };
  
  MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>");