diff options
author | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /arch/mn10300/unit-asb2305/pci.c | |
parent | b2ff4790612bbfa3433cc92e56445c2a40098e2c (diff) | |
parent | edd5eb4e99e4153ea7be05390fda542d986bf28d (diff) | |
download | talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.gz talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'arch/mn10300/unit-asb2305/pci.c')
-rw-r--r-- | arch/mn10300/unit-asb2305/pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c index e37fac0461f3..6b4339f8c9c2 100644 --- a/arch/mn10300/unit-asb2305/pci.c +++ b/arch/mn10300/unit-asb2305/pci.c @@ -24,7 +24,6 @@ unsigned int pci_probe = 1; -int pcibios_last_bus = -1; struct pci_ops *pci_root_ops; /* @@ -392,10 +391,6 @@ char *__init pcibios_setup(char *str) if (!strcmp(str, "off")) { pci_probe = 0; return NULL; - - } else if (!strncmp(str, "lastbus=", 8)) { - pcibios_last_bus = simple_strtol(str+8, NULL, 0); - return NULL; } return str; |