diff options
Diffstat (limited to 'arch/arm/mach-ks8695')
-rw-r--r-- | arch/arm/mach-ks8695/board-dsm320.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/board-micrel.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/devices.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h | 9 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/pci.c | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/arch/arm/mach-ks8695/board-dsm320.c b/arch/arm/mach-ks8695/board-dsm320.c index ada92b6bed24..1338cb3e9827 100644 --- a/arch/arm/mach-ks8695/board-dsm320.c +++ b/arch/arm/mach-ks8695/board-dsm320.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include "generic.h" | 34 | #include "generic.h" |
35 | 35 | ||
36 | #ifdef CONFIG_PCI | 36 | #ifdef CONFIG_PCI |
37 | static int dsm320_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 37 | static int dsm320_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
38 | { | 38 | { |
39 | switch (slot) { | 39 | switch (slot) { |
40 | case 0: | 40 | case 0: |
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index c7ad09bd6ea2..e2e3cba8dcdb 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "generic.h" | 24 | #include "generic.h" |
25 | 25 | ||
26 | #ifdef CONFIG_PCI | 26 | #ifdef CONFIG_PCI |
27 | static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 27 | static int micrel_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
28 | { | 28 | { |
29 | return KS8695_IRQ_EXTERN0; | 29 | return KS8695_IRQ_EXTERN0; |
30 | } | 30 | } |
diff --git a/arch/arm/mach-ks8695/include/mach/devices.h b/arch/arm/mach-ks8695/include/mach/devices.h index 2744fecb429c..85a3c9aa7d13 100644 --- a/arch/arm/mach-ks8695/include/mach/devices.h +++ b/arch/arm/mach-ks8695/include/mach/devices.h | |||
@@ -30,7 +30,7 @@ extern void __init ks8695_init_leds(u8 cpu_led, u8 timer_led); | |||
30 | 30 | ||
31 | struct ks8695_pci_cfg { | 31 | struct ks8695_pci_cfg { |
32 | short mode; | 32 | short mode; |
33 | int (*map_irq)(struct pci_dev *, u8, u8); | 33 | int (*map_irq)(const struct pci_dev *, u8, u8); |
34 | }; | 34 | }; |
35 | extern __init void ks8695_init_pci(struct ks8695_pci_cfg *); | 35 | extern __init void ks8695_init_pci(struct ks8695_pci_cfg *); |
36 | 36 | ||
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index e0f911d9e021..5e0c388143da 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h | |||
@@ -42,13 +42,4 @@ | |||
42 | #define KS8695_PCIIO_PA 0x80000000 | 42 | #define KS8695_PCIIO_PA 0x80000000 |
43 | #define KS8695_PCIIO_SIZE SZ_64K | 43 | #define KS8695_PCIIO_SIZE SZ_64K |
44 | 44 | ||
45 | |||
46 | /* | ||
47 | * PCI support | ||
48 | */ | ||
49 | #define pcibios_assign_all_busses() 1 | ||
50 | |||
51 | #define PCIBIOS_MIN_IO 0 | ||
52 | #define PCIBIOS_MIN_MEM 0 | ||
53 | |||
54 | #endif | 45 | #endif |
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c index 5fcd082a17f9..c7c9a188d105 100644 --- a/arch/arm/mach-ks8695/pci.c +++ b/arch/arm/mach-ks8695/pci.c | |||
@@ -317,6 +317,9 @@ void __init ks8695_init_pci(struct ks8695_pci_cfg *cfg) | |||
317 | return; | 317 | return; |
318 | } | 318 | } |
319 | 319 | ||
320 | pcibios_min_io = 0; | ||
321 | pcibios_min_mem = 0; | ||
322 | |||
320 | printk(KERN_INFO "PCI: Initialising\n"); | 323 | printk(KERN_INFO "PCI: Initialising\n"); |
321 | ks8695_show_pciregs(); | 324 | ks8695_show_pciregs(); |
322 | 325 | ||