diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:20:08 (GMT) |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 11:20:08 (GMT) |
| commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
| tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/plat-s3c24xx/include/plat/common-smdk.h | |
| parent | db3c94a7edc6b29f8d52ba5884dec6a15feeadad (diff) | |
| parent | e90a0f3c460406d6a5a698016bc525c3e6968cb6 (diff) | |
| download | linux-fsl-qoriq-86f82da586098f16d92b5637808c323f5455e935.tar.xz | |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/plat-s3c24xx/include/plat/common-smdk.h')
| -rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/common-smdk.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/common-smdk.h b/arch/arm/plat-s3c24xx/include/plat/common-smdk.h deleted file mode 100644 index 58d9094..0000000 --- a/arch/arm/plat-s3c24xx/include/plat/common-smdk.h +++ /dev/null @@ -1,15 +0,0 @@ -/* linux/include/asm-arm/plat-s3c24xx/common-smdk.h - * - * Copyright (c) 2006 Simtec Electronics - * Ben Dooks <ben@simtec.co.uk> - * - * Common code for SMDK2410 and SMDK2440 boards - * - * http://www.fluff.org/ben/smdk2440/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -extern void smdk_machine_init(void); |