Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[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>
authored by Andrew Victor and committed by Russell King daa7162f 9857caa4
+4
-4
arch/arm/mach-ks8695/board-micrel.c
+4
-4
arch/arm/mach-ks8695/board-micrel.c
···
23
#include "generic.h"
24
25
#ifdef CONFIG_PCI
26
-
static int __init micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
27
{
28
return KS8695_IRQ_EXTERN0;
29
}
30
31
-
static struct ks8695_pci_cfg micrel_pci = {
32
.mode = KS8695_MODE_MINIPCI,
33
.map_irq = micrel_pci_map_irq,
34
};
35
#endif
36
37
38
-
static void micrel_init(void)
39
{
40
printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");
41
42
#ifdef CONFIG_PCI
43
-
ks8695_init_pci(&micrel_pci);
44
#endif
45
46
/* Add devices */
···
23
#include "generic.h"
24
25
#ifdef CONFIG_PCI
26
+
static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
27
{
28
return KS8695_IRQ_EXTERN0;
29
}
30
31
+
static struct ks8695_pci_cfg __initdata micrel_pci = {
32
.mode = KS8695_MODE_MINIPCI,
33
.map_irq = micrel_pci_map_irq,
34
};
35
#endif
36
37
38
+
static void __init micrel_init(void)
39
{
40
printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");
41
42
#ifdef CONFIG_PCI
43
+
// ks8695_init_pci(&micrel_pci);
44
#endif
45
46
/* Add devices */