Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8ad23a4 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] fix iomem annotations in sparc32 pcic code 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7116317d

arch/sparc/kernel/pcic.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static struct pcic_sn2list pcic_known_sysnames[] = { 
static int pcic0_up;

static struct linux_pcic pcic0;



void * __iomem pcic_regs;

void __iomem *pcic_regs;

volatile int pcic_speculative;

volatile int pcic_trapped;

include/asm-sparc/pcic.h

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 
#include <asm/pbm.h>



struct linux_pcic {

        void * __iomem          pcic_regs;

        void __iomem            *pcic_regs;

        unsigned long           pcic_io;

        void * __iomem          pcic_config_space_addr;

        void * __iomem          pcic_config_space_data;

        void __iomem            *pcic_config_space_addr;

        void __iomem            *pcic_config_space_data;

	struct resource		pcic_res_regs;

	struct resource		pcic_res_io;

	struct resource		pcic_res_cfg_addr;