diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-02-03 01:56:07 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-03 01:56:07 +0000 |
| commit | d35b7a829a13b69c4747b69380b504b6544a2375 (patch) | |
| tree | 112749ea0adac0fd634849f8c710dc2a364f671e /arch/arm/Kconfig | |
| parent | 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 (diff) | |
| parent | 84c9b7271a0af08c4e5fce3901a0ad3d952036bc (diff) | |
ARM: Merge next-samsung-s3c244x-merge
Merge branch 'next-samsung-s3c244x-merge' into next-samsung
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3bc5169f0f8..63f726f594f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -794,7 +794,6 @@ source "arch/arm/mach-s3c2400/Kconfig" source "arch/arm/mach-s3c2410/Kconfig" source "arch/arm/mach-s3c2412/Kconfig" source "arch/arm/mach-s3c2440/Kconfig" -source "arch/arm/mach-s3c2442/Kconfig" source "arch/arm/mach-s3c2443/Kconfig" endif |