Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daa7162f authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9857caa4
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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 */