diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-06 01:18:49 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-06 01:18:49 +0400 |
| commit | 186a73dc9a81b087d0708f21a990615957ec9c1c (patch) | |
| tree | a1db8d517665fb27f25d44eacacd4b80a0d540ed /drivers/ata/pata_legacy.c | |
| parent | f375964d34f8f5447dbe7a3b72c071a1d3491bca (diff) | |
| parent | e7062b101537a0c4f4a8d725321772eb78100074 (diff) | |
| download | linux-186a73dc9a81b087d0708f21a990615957ec9c1c.tar.xz | |
Merge tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux into next/cleanup
Merge Kconfig cleanups from Rob Herring:
Several mach kconfig clean-ups of redundant selects
* tag 'kconfig-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
ARM: qcom: clean-up unneeded kconfig selects
ARM: bcm: clean-up unneeded kconfig selects
ARM: mvebu: clean-up unneeded kconfig selects
+ Linux 3.15-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/ata/pata_legacy.c')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index be816428b430..bce2a8ca4678 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c @@ -916,7 +916,6 @@ static __init int probe_chip_type(struct legacy_probe *probe) local_irq_restore(flags); return BIOS; } - local_irq_restore(flags); } if (ht6560a & mask) |