leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 's3c-iis-header' into for-2.6.30

Browse Source 
Conflicts:
	arch/arm/mach-shark/include/mach/io.h
This commit is contained in:
Mark Brown 2009-03-11 11:12:48 +00:00
commit 3c08138400
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-s3c2410/include/mach/hardware.h
View File

@ -131,4 +131,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state);
/* machine specific hardware definitions should go after this */
/* currently here until moved into config (todo) */
#define CONFIG_NO_MULTIWORD_IO
#endif /* __ASM_ARCH_HARDWARE_H */

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

@ -14,8 +14,7 @@
#define PCIO_BASE 0xe0000000
#define IO_SPACE_LIMIT 0xffffffff
#define __io(a) __typesafe_io(PCIO_BASE + (a))
#define __io(a) ((void __iomem *)(PCIO_BASE + (a)))
#define __mem_pci(addr) (addr)
#endif