diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-07-22 00:44:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-22 00:44:59 -0700 |
| commit | 8fd90bb889635fa1e7f80a3950948cc2e74c1446 (patch) | |
| tree | 1490343b5ad9f88b9333e53fa9457c00cbf6c2d1 /drivers/ata/pata_ep93xx.c | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-8fd90bb889635fa1e7f80a3950948cc2e74c1446.tar.xz linux-dev-8fd90bb889635fa1e7f80a3950948cc2e74c1446.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ata/pata_ep93xx.c')
| -rw-r--r-- | drivers/ata/pata_ep93xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c index 6ad5c072ce34..4d37c5415fc7 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -915,7 +915,7 @@ static int ep93xx_pata_probe(struct platform_device *pdev) struct ep93xx_pata_data *drv_data; struct ata_host *host; struct ata_port *ap; - unsigned int irq; + int irq; struct resource *mem_res; void __iomem *ide_base; int err; |