diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-22 02:36:56 -0400 |
| commit | cf9b59e9d3e008591d1f54830f570982bb307a0d (patch) | |
| tree | 113478ce8fd8c832ba726ffdf59b82cb46356476 /drivers/net/myri_sbus.c | |
| parent | 44504b2bebf8b5823c59484e73096a7d6574471d (diff) | |
| parent | f4b87dee923342505e1ddba8d34ce9de33e75050 (diff) | |
Merge remote branch 'origin' into secretlab/next-devicetree
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.
Conflicts:
drivers/i2c/busses/i2c-cpm.c
drivers/i2c/busses/i2c-mpc.c
drivers/net/gianfar.c
Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 77835df4d013..1a57c3da1f49 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -865,7 +865,7 @@ static inline void determine_reg_space_size(struct myri_eth *mp) | |||
| 865 | printk("myricom: AIEEE weird cpu version %04x assuming pre4.0\n", | 865 | printk("myricom: AIEEE weird cpu version %04x assuming pre4.0\n", |
| 866 | mp->eeprom.cpuvers); | 866 | mp->eeprom.cpuvers); |
| 867 | mp->reg_size = (3 * 128 * 1024) + 4096; | 867 | mp->reg_size = (3 * 128 * 1024) + 4096; |
| 868 | }; | 868 | } |
| 869 | } | 869 | } |
| 870 | 870 | ||
| 871 | #ifdef DEBUG_DETECT | 871 | #ifdef DEBUG_DETECT |