git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-bcm
/
bcm63xx_pmb.c
diff --git
a/arch/arm/mach-bcm/bcm63xx_pmb.c
b/arch/arm/mach-bcm/bcm63xx_pmb.c
index de061ec5a47964c99cba838bac515fba48b475eb..41dcf5d65630cfe96da9480e4e0496b19b27d9ae 100644
(file)
--- a/
arch/arm/mach-bcm/bcm63xx_pmb.c
+++ b/
arch/arm/mach-bcm/bcm63xx_pmb.c
@@
-92,7
+92,6
@@
static int bcm63xx_pmb_get_resources(struct device_node *dn,
unsigned int *cpu,
unsigned int *addr)
{
- struct device_node *pmb_dn;
struct of_phandle_args args;
int ret;
@@
-109,7
+108,6
@@
static int bcm63xx_pmb_get_resources(struct device_node *dn,
return ret;
}
- pmb_dn = args.np;
if (args.args_count != 2) {
pr_err("reset-controller does not conform to reset-cells\n");
return -EINVAL;