diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:54:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 21:01:40 +0100 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/block/ps3vram.c | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | kernel-crypto-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.gz kernel-crypto-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz kernel-crypto-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/block/ps3vram.c')
| -rw-r--r-- | drivers/block/ps3vram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 095f97e6066..c8753a9ed29 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -13,8 +13,8 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <asm/cell-regs.h> #include <asm/firmware.h> -#include <asm/iommu.h> #include <asm/lv1call.h> #include <asm/ps3.h> #include <asm/ps3gpu.h> |