diff options
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch')
| -rw-r--r-- | target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch b/target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch deleted file mode 100644 index e5e82b1..0000000 --- a/target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch +++ /dev/null @@ -1,131 +0,0 @@ -From 727d8f48ab606e44af8afee03b87f0cfdc1f8bf5 Mon Sep 17 00:00:00 2001 -From: Andrzej Zaborowski <balrog@zabor.org> -Date: Wed, 2 Jul 2008 22:38:36 +0100 -Subject: [PATCH] Subject: [PATCH] Build fixes. - ---- - arch/arm/mach-s3c2442/Kconfig | 3 ++- - arch/arm/plat-s3c24xx/Kconfig | 2 +- - arch/arm/plat-s3c24xx/time.c | 4 ++-- - include/asm-arm/arch-s3c2410/regs-dsc.h | 4 ++-- - include/asm-arm/kexec.h | 4 ++-- - include/linux/kexec.h | 3 ++- - 6 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig -index 6cc68a1..f9aa91c 100644 ---- a/arch/arm/mach-s3c2442/Kconfig -+++ b/arch/arm/mach-s3c2442/Kconfig -@@ -6,10 +6,11 @@ - - config CPU_S3C2442 - bool -- depends on ARCH_S3C2440 -+ depends on CPU_S3C2440 - select S3C2410_CLOCK - select S3C2410_GPIO - select S3C2410_PM if PM -+ select S3C2440_DMA if S3C2410_DMA - select CPU_S3C244X - select CPU_LLSERIAL_S3C2440 - help -diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig -index 7ee4b82..9e1691f 100644 ---- a/arch/arm/plat-s3c24xx/Kconfig -+++ b/arch/arm/plat-s3c24xx/Kconfig -@@ -16,7 +16,7 @@ if PLAT_S3C24XX - - config CPU_S3C244X - bool -- depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) -+ default y if CPU_S3C2440 || CPU_S3C2442 - help - Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. - -diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c -index 6989eea..39fc33d 100644 ---- a/arch/arm/plat-s3c24xx/time.c -+++ b/arch/arm/plat-s3c24xx/time.c -@@ -202,12 +202,12 @@ static void s3c2410_timer_setup (void) - - pclk = clk_get_rate(clk); - -- printk("pclk = %d\n", pclk); -+ printk("pclk = %lu\n", pclk); - - /* configure clock tick */ - - timer_usec_ticks = timer_mask_usec_ticks(6, pclk); -- printk("timer_usec_ticks = %d\n", timer_usec_ticks); -+ printk("timer_usec_ticks = %lu\n", timer_usec_ticks); - - tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK; - tcfg1 |= S3C2410_TCFG1_MUX4_DIV2; -diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h -index c074851..f9d0c3d 100644 ---- a/include/asm-arm/arch-s3c2410/regs-dsc.h -+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h -@@ -19,7 +19,7 @@ - #define S3C2412_DSC1 S3C2410_GPIOREG(0xe0) - #endif - --#if defined(CONFIG_CPU_S3C2440) -+#if defined(CONFIG_CPU_S3C244X) - - #define S3C2440_DSC0 S3C2410_GPIOREG(0xc4) - #define S3C2440_DSC1 S3C2410_GPIOREG(0xc8) -@@ -178,7 +178,7 @@ - #define S3C2440_DSC1_CS0_4mA (3<<0) - #define S3C2440_DSC1_CS0_MASK (3<<0) - --#endif /* CONFIG_CPU_S3C2440 */ -+#endif /* CONFIG_CPU_S3C244X */ - - #endif /* __ASM_ARCH_REGS_DSC_H */ - -diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h -index 1ee17b6..0fb508b 100644 ---- a/include/asm-arm/kexec.h -+++ b/include/asm-arm/kexec.h -@@ -1,8 +1,6 @@ - #ifndef _ARM_KEXEC_H - #define _ARM_KEXEC_H - --#ifdef CONFIG_KEXEC -- - /* Maximum physical address we can use pages from */ - #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL) - /* Maximum address we can reach in physical address mode */ -@@ -16,6 +14,8 @@ - - #define KEXEC_BOOT_PARAMS_SIZE 1536 - -+#ifdef CONFIG_KEXEC -+ - #define KEXEC_ARM_ATAGS_OFFSET 0x1000 - #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000 - -diff --git a/include/linux/kexec.h b/include/linux/kexec.h -index 2d9c448..9f1a644 100644 ---- a/include/linux/kexec.h -+++ b/include/linux/kexec.h -@@ -1,7 +1,6 @@ - #ifndef LINUX_KEXEC_H - #define LINUX_KEXEC_H - --#ifdef CONFIG_KEXEC - #include <linux/types.h> - #include <linux/list.h> - #include <linux/linkage.h> -@@ -11,6 +10,8 @@ - #include <linux/elf.h> - #include <asm/kexec.h> - -+#ifdef CONFIG_KEXEC -+ - /* Verify architecture specific macros are defined */ - - #ifndef KEXEC_SOURCE_MEMORY_LIMIT --- -1.5.6.5 - |