diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-12 23:45:39 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-12-12 23:45:39 +0000 |
| commit | 819c1a651fec6b370211609ce6eceefd20cf31e4 (patch) | |
| tree | abfe2a3c84e4987f71ea9b71a0bc771c2c7f2a50 | |
| parent | 440e2e4759805437f89f7eda78de72cb46729d04 (diff) | |
| parent | 9f1ee150fc7039eb65039ab17d9a95dfa6250133 (diff) | |
| download | op-kernel-dev-819c1a651fec6b370211609ce6eceefd20cf31e4.zip op-kernel-dev-819c1a651fec6b370211609ce6eceefd20cf31e4.tar.gz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| -rw-r--r-- | arch/arm/mach-mmp/mmp2.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 3 | ||||
| -rw-r--r-- | drivers/mtd/maps/pxa2xx-flash.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c index daf3993..2e3dd08 100644 --- a/arch/arm/mach-mmp/mmp2.c +++ b/arch/arm/mach-mmp/mmp2.c @@ -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); diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index d2060a1..e5c9932 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c @@ -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) { diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index dd90880..d8ae634 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c @@ -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; |
