tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4549/1: KS8695: Fix build errors
[ARM] 4546/1: s3c2410: fix architecture typo for s3c2442
[ARM] 4544/1: arm: fix section mismatch in pxa fb

Linus Torvalds 18115f45 f0f12d85

+6 -6
unified split
+4 -4
arch/arm/mach-ks8695/board-micrel.c
··· 23 23 #include "generic.h" 24 24 25 25 #ifdef CONFIG_PCI 26 - static int __init micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 26 + static int micrel_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 27 27 { 28 28 return KS8695_IRQ_EXTERN0; 29 29 } 30 30 31 - static struct ks8695_pci_cfg micrel_pci = { 31 + static struct ks8695_pci_cfg __initdata micrel_pci = { 32 32 .mode = KS8695_MODE_MINIPCI, 33 33 .map_irq = micrel_pci_map_irq, 34 34 }; 35 35 #endif 36 36 37 37 38 - static void micrel_init(void) 38 + static void __init micrel_init(void) 39 39 { 40 40 printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); 41 41 42 42 #ifdef CONFIG_PCI 43 - ks8695_init_pci(&micrel_pci); 43 + // ks8695_init_pci(&micrel_pci); 44 44 #endif 45 45 46 46 /* Add devices */
+1 -1
arch/arm/mach-s3c2442/Kconfig
··· 6 6 7 7 config CPU_S3C2442 8 8 bool 9 - depends on ARCH_S3C2420 9 + depends on ARCH_S3C2410 10 10 select S3C2410_CLOCK 11 11 select S3C2410_GPIO 12 12 select S3C2410_PM if PM
+1 -1
drivers/video/pxafb.c
··· 66 66 67 67 #ifdef CONFIG_FB_PXA_PARAMETERS 68 68 #define PXAFB_OPTIONS_SIZE 256 69 - static char g_options[PXAFB_OPTIONS_SIZE] __initdata = ""; 69 + static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = ""; 70 70 #endif 71 71 72 72 static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)