* linux-next: manual merge of the staging-next tree with the staging.current tree
@ 2010-04-28 6:08 Stephen Rothwell
2010-04-28 15:25 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-04-28 6:08 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jason Baldus, H Hartley Sweeten
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@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 */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the staging-next tree with the staging.current tree
2010-04-28 6:08 linux-next: manual merge of the staging-next tree with the staging.current tree Stephen Rothwell
@ 2010-04-28 15:25 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2010-04-28 15:25 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Jason Baldus, H Hartley Sweeten
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-28 15:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-28 6:08 linux-next: manual merge of the staging-next tree with the staging.current tree Stephen Rothwell
2010-04-28 15:25 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox