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

Commit 3c081384 authored by Mark Brown's avatar Mark Brown
Browse files

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

Conflicts:
	arch/arm/mach-shark/include/mach/io.h
parents f455dfb1 a2b03461

arch/arm/mach-s3c2410/include/mach/hardware.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -131,4 +131,7 @@ extern int s3c2412_gpio_set_sleepcfg(unsigned int pin, unsigned int state); 




/* machine specific hardware definitions should go after this */

/* 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 */
 
#endif /* __ASM_ARCH_HARDWARE_H */

arch/arm/mach-shark/include/mach/io.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -14,8 +14,7 @@ 
#define PCIO_BASE	0xe0000000

#define PCIO_BASE	0xe0000000

#define IO_SPACE_LIMIT	0xffffffff

#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)

#define __mem_pci(addr)	(addr)





#endif
 
#endif