diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
| commit | 82fc0deb5fb5067c5207ace309b4e3af3eeec17b (patch) | |
| tree | b74cc762f65e4e8957098767b07e423f62cc38a4 /arch/powerpc/platforms/pseries/setup.c | |
| parent | e20e8b472345ea5babd805db6726d1a7000f7673 (diff) | |
| parent | 5210951a4876a42856434546d2789838d3e35f34 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.03-rt
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 0b84df948ed6..7649bee48b09 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -253,9 +253,10 @@ static void __init pseries_discover_pic(void) " interrupt-controller\n"); } -static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node) +static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *data) { - struct device_node *np = node; + struct of_reconfig_data *rd = data; + struct device_node *np = rd->dn; struct pci_dn *pci = NULL; int err = NOTIFY_OK; |