diff options
| author | Andrew Victor <andrew@sanpeople.com> | 2007-08-13 10:02:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-08-14 17:23:55 +0100 |
| commit | daa7162f66ec7f85053b623a3d23ee30b13d036c (patch) | |
| tree | d2836833b14521a3ea0bde48a59114833715cf96 /arch | |
| parent | 9857caa42c86d299b7a80b761a62918a185892ba (diff) | |
| download | linux-daa7162f66ec7f85053b623a3d23ee30b13d036c.tar.gz linux-daa7162f66ec7f85053b623a3d23ee30b13d036c.tar.bz2 linux-daa7162f66ec7f85053b623a3d23ee30b13d036c.zip | |
[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 <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ks8695/board-micrel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 8fc0edb5211e..2feeef81d843 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 */ |