Skip to contentSkip to conversation

arm - remove dead config symbols from ARM code

PATCH New Jiri Olsa 1 participant 1 message Nov 8, 2007

Subsystems (3)
Arm (32-bit) Arm sub-architectures Kernel janitors
lore
Share & tools
lore

Jiri Olsa

author
#0 lore raw

PATCH 1/1 arm - remove dead config symbols from ARM code

remove dead config symbols from ARM code
remove not referenced header SA-1101.h

Signed-off-by Jiri Olsa <[email protected]>
---
 arch/arm/plat-s3c24xx/cpu.c                 |    2 +-
 include/asm-arm/arch-cl7500/acornfb.h       |    4 -
 include/asm-arm/arch-omap/board-innovator.h |    2 +-
 include/asm-arm/arch-s3c2410/map.h          |    2 +-
 include/asm-arm/arch-s3c2410/regs-clock.h   |    4 +-
 include/asm-arm/arch-sa1100/SA-1101.h       |  925 ---------------------------
 include/asm-arm/arch-sa1100/hardware.h      |    4 -
 include/asm-arm/page-nommu.h                |    4 -
 8 files changed, 5 insertions(+), 942 deletions(-)
arch/arm/plat-s3c24xx/cpu.c +1 -1
index f513ab0..778a26c 100644
@@ -187,7 +187,7 @@ static struct cpu_table *cpu;
 
 static unsigned long s3c24xx_read_idcode_v5(void)
 {
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 	return __raw_readl(S3C2412_GSTATUS1);
 #else
 	return 1UL;	/* don't look like an 2400 */
include/asm-arm/arch-cl7500/acornfb.h +0 -4
index aea6330..3f0cbef 100644
@@ -24,10 +24,6 @@ acornfb_vidc20_find_rates(struct vidc_timing *vidc,
 	vidc->pll_ctl  = 0x2020;
 }
 
-#ifdef CONFIG_CHRONTEL_7003
-#define acornfb_default_control()	VIDC20_CTRL_PIX_HCLK
-#else
 #define acornfb_default_control()	VIDC20_CTRL_PIX_VCLK
-#endif
 
 #define acornfb_default_econtrol()	VIDC20_ECTL_DAC | VIDC20_ECTL_REG(3) | VIDC20_ECTL_ECK
include/asm-arm/arch-omap/board-innovator.h +1 -1
index b3cf334..6b2c485 100644
@@ -51,5 +51,5 @@ unsigned char fpga_read(int reg);
 /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */
 #define INNOVATOR1610_ETHR_START	0x04000300
 
-#endif /* CONFIG_ARCH_OMAP1610 */
+#endif /* CONFIG_ARCH_OMAP16XX */
 #endif /* __ASM_ARCH_OMAP_INNOVATOR_H */
include/asm-arm/arch-s3c2410/map.h +1 -1
index b33ed3b..6b718bb 100644
@@ -161,7 +161,7 @@
 
 /* deal with the registers that move under the 2412/2413 */
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 #ifndef __ASSEMBLY__
 extern void __iomem *s3c24xx_va_gpio2;
 #endif
include/asm-arm/arch-s3c2410/regs-clock.h +2 -2
index e39656b..5035b1e 100644
@@ -128,7 +128,7 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk)
 
 #endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 
 #define S3C2412_OSCSET		S3C2410_CLKREG(0x18)
 #define S3C2412_CLKSRC		S3C2410_CLKREG(0x1C)

@@ -188,6 +188,6 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk)
 #define S3C2412_CLKSRC_USBCLK_HCLK		(1<<10)
 #define S3C2412_CLKSRC_CAMCLK_HCLK		(1<<11)
 
-#endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */
+#endif /* CONFIG_CPU_S3C2412 */
 
 #endif /* __ASM_ARM_REGS_CLOCK */
include/asm-arm/arch-sa1100/SA-1101.h deleted +0 -925

925 lines not on this page · raw message

include/asm-arm/arch-sa1100/hardware.h +0 -4
index 1abd7cf..555baf6 100644
@@ -50,8 +50,4 @@
 
 #include "SA-1100.h"
 
-#ifdef CONFIG_SA1101
-#include "SA-1101.h"
-#endif
-
 #endif  /* _ASM_ARCH_HARDWARE_H */
include/asm-arm/page-nommu.h +0 -4
index a1bcad0..67cfb2c 100644
@@ -10,11 +10,7 @@
 #ifndef _ASMARM_PAGE_NOMMU_H
 #define _ASMARM_PAGE_NOMMU_H
 
-#if !defined(CONFIG_SMALL_TASKS) && PAGE_SHIFT < 13
-#define KTHREAD_SIZE (8192)
-#else
 #define KTHREAD_SIZE PAGE_SIZE
-#endif
  
 #define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)
 #define free_user_page(page, addr)	free_page(addr)