diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-09 08:06:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-09 08:06:27 -0700 |
| commit | c5b9004baac077fb472cc7ac8293f2a9fc918d22 (patch) | |
| tree | 9f9d53daca94392165425c348e83d4795806fac9 /drivers/ata/sata_fsl.c | |
| parent | 098107a01a2d427d0be9c19ae5bc9a410efed0c9 (diff) | |
| parent | ac2c5bd05c88185ecbe7c114e472716f2e2d3a0c (diff) | |
| download | op-kernel-dev-c5b9004baac077fb472cc7ac8293f2a9fc918d22.zip op-kernel-dev-c5b9004baac077fb472cc7ac8293f2a9fc918d22.tar.gz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
ata/sata_fsl: Remove unused variable in sata_fsl_probe
pata_sil680: Fix build on arch/ppc
Diffstat (limited to 'drivers/ata/sata_fsl.c')
| -rw-r--r-- | drivers/ata/sata_fsl.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 4c198551..9d1e3ca 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c @@ -1256,7 +1256,6 @@ static int sata_fsl_probe(struct of_device *ofdev, void __iomem *ssr_base = NULL; void __iomem *csr_base = NULL; struct sata_fsl_host_priv *host_priv = NULL; - struct resource *r; int irq; struct ata_host *host; @@ -1266,8 +1265,6 @@ static int sata_fsl_probe(struct of_device *ofdev, dev_printk(KERN_INFO, &ofdev->dev, "Sata FSL Platform/CSB Driver init\n"); - r = kmalloc(sizeof(struct resource), GFP_KERNEL); - hcr_base = of_iomap(ofdev->node, 0); if (!hcr_base) goto error_exit_with_cleanup; |
