diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 10:28:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-18 10:28:21 -0700 |
| commit | 18115f45374d19ada218fc013aa5308baf5d283e (patch) | |
| tree | 820dbd1f044c3384f0bcb3ba42c211e24aa0bc0b /arch | |
| parent | f0f12d85af8593e45fdf4a4d4c7cad240a6787a2 (diff) | |
| parent | daa7162f66ec7f85053b623a3d23ee30b13d036c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4549/1: KS8695: Fix build errors
[ARM] 4546/1: s3c2410: fix architecture typo for s3c2442
[ARM] 4544/1: arm: fix section mismatch in pxa fb
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ks8695/board-micrel.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2442/Kconfig | 2 |
2 files changed, 5 insertions, 5 deletions
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 */ 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 |