summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-samsung/include
diff options
context:
space:
mode:
authorAlexey Galakhov <agalakhov@gmail.com>2012-05-18 15:43:25 +0600
committerSascha Hauer <s.hauer@pengutronix.de>2012-05-21 21:58:26 +0200
commit5ef3ecd922e459b50b7a2e4c61d8b876ee1c146a (patch)
treed45cf896f90cd1e257d05ccca0aa54e5079eb0cf /arch/arm/mach-samsung/include
parentfd0e39fe55393565d5493e2e111a60470d750a68 (diff)
downloadbarebox-5ef3ecd922e459b50b7a2e4c61d8b876ee1c146a.tar.gz
barebox-5ef3ecd922e459b50b7a2e4c61d8b876ee1c146a.tar.xz
Make S3C24xx config options available for all S3Cs
Signed-off-by: Alexey Galakhov <agalakhov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-samsung/include')
-rw-r--r--arch/arm/mach-samsung/include/mach/s3c-iomap.h2
-rw-r--r--arch/arm/mach-samsung/include/mach/s3c24xx-nand.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-samsung/include/mach/s3c-iomap.h b/arch/arm/mach-samsung/include/mach/s3c-iomap.h
index 9e867f8a34..60d44e3165 100644
--- a/arch/arm/mach-samsung/include/mach/s3c-iomap.h
+++ b/arch/arm/mach-samsung/include/mach/s3c-iomap.h
@@ -54,7 +54,7 @@
* if we are booting from NAND, its internal SRAM occures at
* a different address than without this feature
*/
-#ifdef CONFIG_S3C24XX_NAND_BOOT
+#ifdef CONFIG_S3C_NAND_BOOT
# define NFC_RAM_AREA 0x00000000
#else
# define NFC_RAM_AREA 0x40000000
diff --git a/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h b/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h
index 7610b4e29d..acd78b8cd6 100644
--- a/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h
+++ b/arch/arm/mach-samsung/include/mach/s3c24xx-nand.h
@@ -18,7 +18,7 @@
*
*/
-#ifdef CONFIG_S3C24XX_NAND_BOOT
+#ifdef CONFIG_S3C_NAND_BOOT
extern void s3c24x0_nand_load_image(void*, int, int);
#endif