Commit d627a2eb authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up the ioremap_fixed() build for nommu. 



arch/sh/kernel/setup.c:455: error: implicit declaration of function 'ioremap_fixed_init'

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 84959359

arch/sh/include/asm/io.h

+18 −18
Original line number Diff line number Diff line
@@ -273,24 +273,6 @@ void __iomem *__ioremap_caller(unsigned long offset, unsigned long size, 
			       pgprot_t prot, void *caller);

void __iounmap(void __iomem *addr);



#ifdef CONFIG_IOREMAP_FIXED

extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,

				   unsigned long, pgprot_t);

extern int iounmap_fixed(void __iomem *);

extern void ioremap_fixed_init(void);

#else

static inline void __iomem *

ioremap_fixed(resource_size_t phys_addr, unsigned long offset,

	      unsigned long size, pgprot_t prot)

{

	BUG();

	return NULL;

}



static inline void ioremap_fixed_init(void) { }

static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }

#endif



static inline void __iomem *

__ioremap(unsigned long offset, unsigned long size, pgprot_t prot)

{
@@ -365,6 +347,24 @@ ioremap_prot(resource_size_t offset, unsigned long size, unsigned long flags) 
}

#endif



#ifdef CONFIG_IOREMAP_FIXED

extern void __iomem *ioremap_fixed(resource_size_t, unsigned long,

				   unsigned long, pgprot_t);

extern int iounmap_fixed(void __iomem *);

extern void ioremap_fixed_init(void);

#else

static inline void __iomem *

ioremap_fixed(resource_size_t phys_addr, unsigned long offset,

	      unsigned long size, pgprot_t prot)

{

	BUG();

	return NULL;

}



static inline void ioremap_fixed_init(void) { }

static inline int iounmap_fixed(void __iomem *addr) { return -EINVAL; }

#endif



#define ioremap_nocache	ioremap

#define iounmap		__iounmap