diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:14:38 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 17:14:38 +0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /arch/powerpc/platforms/ps3/htab.c | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
| download | linux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'arch/powerpc/platforms/ps3/htab.c')
| -rw-r--r-- | arch/powerpc/platforms/ps3/htab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index 15a2510ee639..3124cf791ebb 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c @@ -19,7 +19,7 @@ */ #include <linux/kernel.h> -#include <linux/lmb.h> +#include <linux/memblock.h> #include <asm/machdep.h> #include <asm/prom.h> |