forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into for-next

Browse source 
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
This commit is contained in:
Jiri Kosina 2011-07-11 14:15:48 +02:00
commit b7e9c223be
993 changed files with 34561 additions and 5907 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/avr32/mach-at32ap/intc.c
View file

@ -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