diff options
| author | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
| commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
| tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /arch/arm/mach-ep93xx/include/mach/io.h | |
| parent | 08e3daff217059c84c360cc71212686e0a7995af (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
| download | op-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.zip op-kernel-dev-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/mach-ep93xx/include/mach/io.h')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/io.h b/arch/arm/mach-ep93xx/include/mach/io.h index cebcc1c..594b77f 100644 --- a/arch/arm/mach-ep93xx/include/mach/io.h +++ b/arch/arm/mach-ep93xx/include/mach/io.h @@ -1,6 +1,7 @@ /* * arch/arm/mach-ep93xx/include/mach/io.h */ + #ifndef __ASM_MACH_IO_H #define __ASM_MACH_IO_H |
