diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-10 10:52:59 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-10 10:52:59 +0200 |
| commit | b920eb41a8241c54efbbd4f2ed6d074f497b0d9e (patch) | |
| tree | 5941091817e932add192f8e58dc88d483322e214 /arch/arm/kernel/bios32.c | |
| parent | regulator: Fix build error for mc13783 and mc13892 (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | linux-b920eb41a8241c54efbbd4f2ed6d074f497b0d9e.tar.xz linux-b920eb41a8241c54efbbd4f2ed6d074f497b0d9e.zip | |
Merge tag 'v3.4-rc2' into regulator-drivers
Linux 3.4-rc2 contains some fixes that further patches depend upon.
Diffstat (limited to 'arch/arm/kernel/bios32.c')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 632df9a66f8c..ede5f7741c42 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -299,7 +299,6 @@ static inline int pdev_bad_for_parity(struct pci_dev *dev) */ void pcibios_fixup_bus(struct pci_bus *bus) { - struct pci_sys_data *root = bus->sysdata; struct pci_dev *dev; u16 features = PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_FAST_BACK; |