diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 08:57:03 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 01:36:33 -0800 |
commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch/arm/mach-s3c24xx/include/mach/fb.h | |
parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'arch/arm/mach-s3c24xx/include/mach/fb.h')
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/fb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/include/mach/fb.h b/arch/arm/mach-s3c24xx/include/mach/fb.h new file mode 100644 index 000000000000..a957bc8ed44f --- /dev/null +++ b/arch/arm/mach-s3c24xx/include/mach/fb.h @@ -0,0 +1 @@ +#include <plat/fb-s3c2410.h> |