diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 10:56:04 +1100 |
| commit | 4286f84ef6d7f44de1e70b904706bdc3e1f7af01 (patch) | |
| tree | 1fd5fc121f508525d62b0bdf7cc22f16c18b110d /arch/powerpc/platforms/86xx/gef_sbc310.c | |
| parent | Merge remote-tracking branch 'jwb/next' into next (diff) | |
| parent | powerpc: document the FSL MPIC message register binding (diff) | |
| download | linux-dev-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.tar.xz linux-dev-4286f84ef6d7f44de1e70b904706bdc3e1f7af01.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/86xx/gef_sbc310.c')
| -rw-r--r-- | arch/powerpc/platforms/86xx/gef_sbc310.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c index 3ecee25bf3ed..710db69bd523 100644 --- a/arch/powerpc/platforms/86xx/gef_sbc310.c +++ b/arch/powerpc/platforms/86xx/gef_sbc310.c @@ -37,9 +37,9 @@ #include <sysdev/fsl_pci.h> #include <sysdev/fsl_soc.h> +#include <sysdev/ge/ge_pic.h> #include "mpc86xx.h" -#include "gef_pic.h" #undef DEBUG |