linux-next: manual merge of the staging-next tree with the staging.current tree
in [Kernel]
|
Prev: linux-next: manual merge of the staging-next tree with the pcmcia tree
Next: [git pull] PCMCIA bugfixes for 2.6.34-rc6
From: Stephen Rothwell on 28 Apr 2010 02:10 Hi Greg, Today's linux-next merge of the staging-next tree got a conflict in drivers/staging/dt3155/dt3155_drv.c between commit 19ba984dd7d8dcf67cebc2ba55abbe454e318fb3 ("Staging: dt3155: fix 50Hz configuration") from the staging.current tree and commit da7bcc953ecf52d33b76b983ad5491d4d29f5f6a ("Staging: dt3155: fix parentheses and bracket spacing style issues") from the staging-next tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc drivers/staging/dt3155/dt3155_drv.c index 7ac2c6d,993ed2f..0000000 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@@ -464,9 -473,9 +465,9 @@@ static void dt3155_init_isr(int minor /* 50/60 Hz should be set before this point but let's make sure it is */ /* right anyway */ - ReadI2C(dt3155_lbase[ minor ], CSR2, &i2c_csr2.reg); - ReadI2C(dt3155_lbase[minor], CONFIG, &i2c_csr2.reg); ++ ReadI2C(dt3155_lbase[minor], CSR2, &i2c_csr2.reg); i2c_csr2.fld.HZ50 = FORMAT50HZ; - WriteI2C(dt3155_lbase[ minor ], CSR2, i2c_csr2.reg); - WriteI2C(dt3155_lbase[minor], CONFIG, i2c_config.reg); ++ WriteI2C(dt3155_lbase[minor], CSR2, i2c_csr2.reg); /* enable busmaster chip, clear flags */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 28 Apr 2010 12:00
On Wed, Apr 28, 2010 at 04:08:03PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging-next tree got a conflict in > drivers/staging/dt3155/dt3155_drv.c between commit > 19ba984dd7d8dcf67cebc2ba55abbe454e318fb3 ("Staging: dt3155: fix 50Hz > configuration") from the staging.current tree and commit > da7bcc953ecf52d33b76b983ad5491d4d29f5f6a ("Staging: dt3155: fix > parentheses and bracket spacing style issues") from the staging-next tree. > > I fixed it up (see below) and can carry the fix as necessary. The fix looks fine, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |