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 remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-cns3xxx
/
pm.c
diff --git
a/arch/arm/mach-cns3xxx/pm.c
b/arch/arm/mach-cns3xxx/pm.c
index fb38c726e9877d5472608cedf237913cf0efa23f..f46b78dd613655e0b2ec2acdfea7f9ccdeee710d 100644
(file)
--- a/
arch/arm/mach-cns3xxx/pm.c
+++ b/
arch/arm/mach-cns3xxx/pm.c
@@
-73,7
+73,6
@@
static void cns3xxx_pwr_soft_rst_force(unsigned int block)
__raw_writel(reg, PM_SOFT_RST_REG);
}
-EXPORT_SYMBOL(cns3xxx_pwr_soft_rst_force);
void cns3xxx_pwr_soft_rst(unsigned int block)
{