Commit:     daa7162f66ec7f85053b623a3d23ee30b13d036c
Parent:     9857caa42c86d299b7a80b761a62918a185892ba
Author:     Andrew Victor <[EMAIL PROTECTED]>
AuthorDate: Mon Aug 13 10:02:18 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Tue Aug 14 17:23:55 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 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 
index 8fc0edb..2feeef8 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,
-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);
        /* Add devices */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to