diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
| commit | df597efb5737063497f1a4f7c996cc9aec294230 (patch) | |
| tree | 17bb60f68ee299d9717038197a932501625f1621 /drivers/net/tokenring | |
| parent | a33bc5c15154c835aae26f16e6a3a7d9ad4acb45 (diff) | |
| parent | 0a924578bc4a2823a95c151f56975c71f5c156bb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/tokenring')
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 6472ba5cfc5e..96d00c8f8d3e 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -1912,7 +1912,7 @@ static int __init ibmtr_init(void) | |||
| 1912 | 1912 | ||
| 1913 | find_turbo_adapters(io); | 1913 | find_turbo_adapters(io); |
| 1914 | 1914 | ||
| 1915 | for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) { | 1915 | for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) { |
| 1916 | struct net_device *dev; | 1916 | struct net_device *dev; |
| 1917 | irq[i] = 0; | 1917 | irq[i] = 0; |
| 1918 | mem[i] = 0; | 1918 | mem[i] = 0; |