Merge commit 'gcl/gcl-next'

This commit is contained in:
Benjamin Herrenschmidt 2008-07-15 11:55:27 +10:00
commit 5b0504c0d7
24 changed files with 1620 additions and 257 deletions

View file

@ -17,7 +17,7 @@
#include <linux/interrupt.h>
#if defined(CONFIG_PPC_MERGE)
#include <asm/of_platform.h>
#include <linux/of_platform.h>
#else
#include <linux/platform_device.h>
#endif