git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
avr32
/
mach-at32ap
/
intc.c
diff --git
a/arch/avr32/mach-at32ap/intc.c
b/arch/avr32/mach-at32ap/intc.c
index
3e36461
..
c9ac2f8
100644
(file)
--- a/
arch/avr32/mach-at32ap/intc.c
+++ b/
arch/avr32/mach-at32ap/intc.c
@@
-167,14
+167,12
@@
static int intc_suspend(void)
return 0;
}
-static
int
intc_resume(void)
+static
void
intc_resume(void)
{
int i;
for (i = 0; i < 64; i++)
intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]);
-
- return 0;
}
#else
#define intc_suspend NULL