diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 23:38:26 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-22 23:38:26 +0000 |
commit | 7f0ff702cdf51472750f4b6042866f1b83a11215 (patch) | |
tree | 15ce32849cfb8ff3c7205e97a5f76051c08058b0 /arch/arm/mach-s3c64xx/include/mach/hardware.h | |
parent | d35b7a829a13b69c4747b69380b504b6544a2375 (diff) | |
parent | 110d85acd479b80dc11b7fa3abef63285da8ea0c (diff) |
ARM: Merge next-samsung-s3c64xx-platdeletion
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung
Conflicts:
arch/arm/mach-s3c64xx/Makefile (fixed)
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/hardware.h')
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/hardware.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/hardware.h b/arch/arm/mach-s3c64xx/include/mach/hardware.h new file mode 100644 index 00000000000..862d033e57a --- /dev/null +++ b/arch/arm/mach-s3c64xx/include/mach/hardware.h @@ -0,0 +1,16 @@ +/* linux/arch/arm/mach-s3c6400/include/mach/hardware.h + * + * Copyright 2008 Openmoko, Inc. + * Copyright 2008 Simtec Electronics + * Ben Dooks <ben@simtec.co.uk> + * http://armlinux.simtec.co.uk/ + * + * S3C6400 - Hardware support + */ + +#ifndef __ASM_ARCH_HARDWARE_H +#define __ASM_ARCH_HARDWARE_H __FILE__ + +/* currently nothing here, placeholder */ + +#endif /* __ASM_ARCH_IRQ_H */ |