diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-09-25 12:15:15 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-25 12:15:15 +0900 |
commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /arch/arm/mach-pxa/e740.c | |
parent | sh: enable onenand support in kfr2r09 defconfig. (diff) | |
parent | Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev (diff) | |
download | linux-dev-c373ba999103fa794f041eab5bd490714d2dee88.tar.xz linux-dev-c373ba999103fa794f041eab5bd490714d2dee88.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/e740.c')
-rw-r--r-- | arch/arm/mach-pxa/e740.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/e740.c b/arch/arm/mach-pxa/e740.c index a36fc17f671d..49acdfa6650d 100644 --- a/arch/arm/mach-pxa/e740.c +++ b/arch/arm/mach-pxa/e740.c @@ -199,7 +199,6 @@ static void __init e740_init(void) platform_add_devices(devices, ARRAY_SIZE(devices)); pxa_set_udc_info(&e7xx_udc_mach_info); pxa_set_ac97_info(NULL); - e7xx_irda_init(); pxa_set_ficp_info(&e7xx_ficp_platform_data); } |