diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:54:16 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 23:54:16 +0100 |
commit | 374da9da22ebaad0524c77905b5e89ae4619bef3 (patch) | |
tree | 78f8ebbbc2e730b8e510e3a68b5b73755196fb68 /arch/arm/mach-sa1100/neponset.c | |
parent | fbae0f8912dc12b284433c05417ea76311205bbf (diff) | |
parent | 81e6ca3eb74d6bdbab181dd2db378f49f76f0d97 (diff) | |
download | op-kernel-dev-374da9da22ebaad0524c77905b5e89ae4619bef3.zip op-kernel-dev-374da9da22ebaad0524c77905b5e89ae4619bef3.tar.gz |
Merge branch 'sa1111' into sa11x0
Conflicts:
arch/arm/common/sa1111.c
arch/arm/mach-sa1100/neponset.c
Fixed:
arch/arm/mach-sa1100/assabet.c
for the neponset changes
Diffstat (limited to 'arch/arm/mach-sa1100/neponset.c')
-rw-r--r-- | arch/arm/mach-sa1100/neponset.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c index 7ffa631..3297aa2 100644 --- a/arch/arm/mach-sa1100/neponset.c +++ b/arch/arm/mach-sa1100/neponset.c @@ -229,6 +229,7 @@ static struct irq_chip nochip = { static struct sa1111_platform_data sa1111_info = { .irq_base = IRQ_BOARD_END, + .disable_devs = SA1111_DEVID_PS2_MSE, }; static int __devinit neponset_probe(struct platform_device *dev) @@ -432,17 +433,3 @@ static int __init neponset_init(void) } subsys_initcall(neponset_init); - -static struct map_desc neponset_io_desc[] __initdata = { - { /* SA-1111 */ - .virtual = 0xf4000000, - .pfn = __phys_to_pfn(0x40000000), - .length = SZ_1M, - .type = MT_DEVICE - } -}; - -void __init neponset_map_io(void) -{ - iotable_init(neponset_io_desc, ARRAY_SIZE(neponset_io_desc)); -} |