diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 11:04:49 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 11:04:49 +0100 |
commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /arch/frv/mb93090-mb00/pci-frv.h | |
parent | Input: pmic8xxx-pwrkey - migrate to regmap APIs (diff) | |
parent | Linux 3.13-rc4 (diff) | |
download | linux-348324c5b10bcba8d9daabdfb85a6927311be34f.tar.xz linux-348324c5b10bcba8d9daabdfb85a6927311be34f.zip |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'arch/frv/mb93090-mb00/pci-frv.h')
-rw-r--r-- | arch/frv/mb93090-mb00/pci-frv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-frv.h b/arch/frv/mb93090-mb00/pci-frv.h index 76c4e73d643d..a7e487fe76ed 100644 --- a/arch/frv/mb93090-mb00/pci-frv.h +++ b/arch/frv/mb93090-mb00/pci-frv.h @@ -30,7 +30,6 @@ void pcibios_resource_survey(void); /* pci-vdk.c */ -extern int __nongpreldata pcibios_last_bus; extern struct pci_ops *__nongpreldata pci_root_ops; /* pci-irq.c */ |