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

Commit 18115f45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f0f12d85 daa7162f

arch/arm/mach-ks8695/board-micrel.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -23,24 +23,24 @@ 
#include "generic.h"

#include "generic.h"





#ifdef CONFIG_PCI

#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;

	return KS8695_IRQ_EXTERN0;

}

}





static struct ks8695_pci_cfg micrel_pci = {

static struct ks8695_pci_cfg __initdata micrel_pci = {

	.mode		= KS8695_MODE_MINIPCI,

	.mode		= KS8695_MODE_MINIPCI,

	.map_irq	= micrel_pci_map_irq,

	.map_irq	= micrel_pci_map_irq,

};

};

#endif

#endif









static void micrel_init(void)

static void __init micrel_init(void)

{

{

	printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");

	printk(KERN_INFO "Micrel KS8695 Development Board initializing\n");





#ifdef CONFIG_PCI

#ifdef CONFIG_PCI

	ks8695_init_pci(&micrel_pci);

//	ks8695_init_pci(&micrel_pci);

#endif

#endif





	/* Add devices */

	/* Add devices */

arch/arm/mach-s3c2442/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 




config CPU_S3C2442

config CPU_S3C2442

	bool

	bool

	depends on ARCH_S3C2420

	depends on ARCH_S3C2410

	select S3C2410_CLOCK

	select S3C2410_CLOCK

	select S3C2410_GPIO

	select S3C2410_GPIO

	select S3C2410_PM if PM

	select S3C2410_PM if PM

drivers/video/pxafb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ static void set_ctrlr_state(struct pxafb_info *fbi, u_int state); 




#ifdef CONFIG_FB_PXA_PARAMETERS

#ifdef CONFIG_FB_PXA_PARAMETERS

#define PXAFB_OPTIONS_SIZE 256

#define PXAFB_OPTIONS_SIZE 256

static char g_options[PXAFB_OPTIONS_SIZE] __initdata = "";

static char g_options[PXAFB_OPTIONS_SIZE] __devinitdata = "";

#endif

#endif





static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)

static inline void pxafb_schedule_work(struct pxafb_info *fbi, u_int state)