Skip to content

Commit

Permalink
[ARM] 4549/1: KS8695: Fix build errors
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Victor authored and Russell King committed Aug 14, 2007
1 parent 9857caa commit daa7162
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-ks8695/board-micrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit daa7162

Please sign in to comment.