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

Commit 819c1a65 authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 440e2e47 9f1ee150

arch/arm/mach-mmp/mmp2.c

+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ static APBC_CLK(twsi3, MMP2_TWSI3, 0, 26000000); 
static APBC_CLK(twsi4, MMP2_TWSI4, 0, 26000000);

static APBC_CLK(twsi5, MMP2_TWSI5, 0, 26000000);

static APBC_CLK(twsi6, MMP2_TWSI6, 0, 26000000);

static APBC_CLK(rtc, MMP2_RTC, 0, 32768);



static APMU_CLK(nand, NAND, 0xbf, 100000000);

arch/arm/mach-pxa/palmtx.c

+2 −1
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ static inline void palmtx_keys_init(void) {} 
/******************************************************************************

 * NAND Flash

 ******************************************************************************/

#if defined(CONFIG_MTD_NAND_GPIO) || defined(CONFIG_MTD_NAND_GPIO_MODULE)

#if defined(CONFIG_MTD_NAND_PLATFORM) || \

	defined(CONFIG_MTD_NAND_PLATFORM_MODULE)

static void palmtx_nand_cmd_ctl(struct mtd_info *mtd, int cmd,

				 unsigned int ctrl)

{

drivers/mtd/maps/pxa2xx-flash.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct pxa2xx_flash_info { 
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };





static int __init pxa2xx_flash_probe(struct platform_device *pdev)

static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)

{

	struct flash_platform_data *flash = pdev->dev.platform_data;

	struct pxa2xx_flash_info *info;