lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge 7xx-iosplit-plat-merge with omap-fixes

Browse Source 
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
This commit is contained in:
Tony Lindgren
2009-11-22 10:08:43 -08:00
parent 648f4e3e50 8171d88089
commit a76df42a67
272 changed files with 3838 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/mailbox.c
View File

@@ -15,7 +15,7 @@
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <mach/mailbox.h>
#include <plat/mailbox.h>
#include <mach/irqs.h>
#define MAILBOX_REVISION 0x000