Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[mirror_ubuntu-hirsute-kernel.git] / arch / powerpc / platforms / cell / spufs / hw_ops.c

diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c
index ede2cac46b6d0899b76b6cd426fb9cceb764df8b..efc452e71ab0f03b93b4d3178d28cc05ef1200c1 100644 (file)
--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
@@ -235,7 +234,7 @@ static void spu_hw_runcntl_stop(struct spu_context *ctx)
 
 static int spu_hw_set_mfc_query(struct spu_context * ctx, u32 mask, u32 mode)
 {
-       struct spu_problem *prob = ctx->spu->problem;
+       struct spu_problem __iomem *prob = ctx->spu->problem;
        int ret;
 
        spin_lock_irq(&ctx->spu->register_lock);
@@ -264,7 +263,7 @@ static int spu_hw_send_mfc_command(struct spu_context *ctx,
                                        struct mfc_dma_command *cmd)
 {
        u32 status;
-       struct spu_problem *prob = ctx->spu->problem;
+       struct spu_problem __iomem *prob = ctx->spu->problem;
 
        spin_lock_irq(&ctx->spu->register_lock);
        out_be32(&prob->mfc_lsa_W, cmd->lsa);