From 9857caa42c86d299b7a80b761a62918a185892ba Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Thu, 9 Aug 2007 16:37:01 +0100 Subject: [ARM] 4546/1: s3c2410: fix architecture typo for s3c2442 From: Krzysztof Helt This patch fixes a typo in architecture constant name. The kernel for s3c2442 machines does not build without this fix. Signed-off-by: Krzysztof Helt Acked-by: Ben Dooks Signed-off-by: Russell King --- arch/arm/mach-s3c2442/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch') diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig index 88d5fd34fe3..26d131a7707 100644 --- a/arch/arm/mach-s3c2442/Kconfig +++ b/arch/arm/mach-s3c2442/Kconfig @@ -6,7 +6,7 @@ config CPU_S3C2442 bool - depends on ARCH_S3C2420 + depends on ARCH_S3C2410 select S3C2410_CLOCK select S3C2410_GPIO select S3C2410_PM if PM -- cgit v1.2.3 From daa7162f66ec7f85053b623a3d23ee30b13d036c Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Mon, 13 Aug 2007 10:02:18 +0100 Subject: [ARM] 4549/1: KS8695: Fix build errors The PCI driver has not been merged yet, so comment out call to ks8695_init_pci() for now. Also fix some incorrectly marked __init and __initdata sections. Signed-off-by: Andrew Victor Signed-off-by: Russell King --- arch/arm/mach-ks8695/board-micrel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 8fc0edb5211..2feeef81d84 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c @@ -23,24 +23,24 @@ #include "generic.h" #ifdef CONFIG_PCI -static int __init micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) { return KS8695_IRQ_EXTERN0; } -static struct ks8695_pci_cfg micrel_pci = { +static struct ks8695_pci_cfg __initdata micrel_pci = { .mode = KS8695_MODE_MINIPCI, .map_irq = micrel_pci_map_irq, }; #endif -static void micrel_init(void) +static void __init micrel_init(void) { printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); #ifdef CONFIG_PCI - ks8695_init_pci(&micrel_pci); +// ks8695_init_pci(&micrel_pci); #endif /* Add devices */ -- cgit v1.2.3