redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[ARM] shark: avoid polluting the kernel's namespace 

Avoid unnecessarily pollution of the kernel's namespace by avoiding
mach/hardware.h in mach/io.h.  Include this header file where necessary.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
wifi-calibration
Russell King 2008-11-28 16:13:44 +00:00 committed by Russell King
parent 514161b601
commit 47190a3350
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shark/core.c
View File

@ -16,6 +16,8 @@
#include <asm/leds.h>
#include <asm/param.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>

2
arch/arm/mach-shark/include/mach/hardware.h
View File

@ -28,8 +28,6 @@
#define ROMCARD_SIZE 0x08000000
#define ROMCARD_START 0x10000000
#define PCIO_BASE 0xe0000000
/* defines for the Framebuffer */
#define FB_START 0x06000000

27
arch/arm/mach-shark/include/mach/io.h
View File

@ -11,29 +11,10 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <mach/hardware.h>
#define PCIO_BASE 0xe0000000
#define IO_SPACE_LIMIT 0xffffffff
#define IO_SPACE_LIMIT 0xffffffff
/*
* We use two different types of addressing - PC style addresses, and ARM
* addresses. PC style accesses the PC hardware with the normal PC IO
* addresses, eg 0x3f8 for serial#1. ARM addresses are 0x80000000+
* and are translated to the start of IO.
*/
#define __PORT_PCIO(x) (!((x) & 0x80000000))
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
static inline unsigned int __ioaddr (unsigned int port) \
{ \
if (__PORT_PCIO(port)) \
return (unsigned int)(PCIO_BASE + (port)); \
else \
return (unsigned int)(IO_BASE + (port)); \
}
#define __mem_pci(addr) (addr)
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
#define __mem_pci(addr) (addr)
#endif