Messages in this thread | | | Date | Tue, 4 Sep 2012 12:04:36 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the pci tree with Linus' tree |
| |
Hi Bjorn,
Today's linux-next merge of the pci tree got a conflict in drivers/rapidio/devices/tsi721.c between commit 9a9a9a7adafe ("rapidio/tsi721: fix unused variable compiler warning") from Linus' tree and commit 5cdaaf8a11ba ("rapdio/tsi721: Use PCI Express Capability accessors") from the pci tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/rapidio/devices/tsi721.c index 5d44252,fc22b93..0000000 --- a/drivers/rapidio/devices/tsi721.c +++ b/drivers/rapidio/devices/tsi721.c @@@ -2219,9 -2212,8 +2219,7 @@@ static int __devinit tsi721_probe(struc const struct pci_device_id *id) { struct tsi721_device *priv; - int cap; - int i; int err; - u32 regval; priv = kzalloc(sizeof(struct tsi721_device), GFP_KERNEL); if (priv == NULL) { [unhandled content-type:application/pgp-signature] | |