diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-10 11:14:28 (GMT) |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-11-13 10:08:13 (GMT) |
| commit | 4386e1fbcdacfbbc97a856f9e73b178bd5f6a3e1 (patch) | |
| tree | 53760c89ab4af428043b4bb821b7a010730f64d0 | |
| parent | b75d47b4772c199225a351f3b8543e6e16b9c08b (diff) | |
| download | linux-4386e1fbcdacfbbc97a856f9e73b178bd5f6a3e1.tar.xz | |
ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option
The CONFIG_ARCH_AT91SAM9G45 config option was removed by ("ARM: at91: remove
at91sam9g45/9m10 legacy board support") so cleanup the use of it.
Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
| -rw-r--r-- | arch/arm/mach-at91/Makefile.boot | 6 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board.h | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot index 5309f9b..29ed0fa 100644 --- a/arch/arm/mach-at91/Makefile.boot +++ b/arch/arm/mach-at91/Makefile.boot @@ -3,12 +3,6 @@ # PARAMS_PHYS must be within 4MB of ZRELADDR # INITRD_PHYS must be in RAM -ifeq ($(CONFIG_ARCH_AT91SAM9G45),y) - zreladdr-y += 0x70008000 -params_phys-y := 0x70000100 -initrd_phys-y := 0x70410000 -else zreladdr-y += 0x20008000 params_phys-y := 0x20000100 initrd_phys-y := 0x20410000 -endif diff --git a/arch/arm/mach-at91/board.h b/arch/arm/mach-at91/board.h index 836e9a5..d268ec3 100644 --- a/arch/arm/mach-at91/board.h +++ b/arch/arm/mach-at91/board.h @@ -56,11 +56,7 @@ extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data); extern void __init at91_add_device_nand(struct atmel_nand_data *data); /* I2C*/ -#if defined(CONFIG_ARCH_AT91SAM9G45) -extern void __init at91_add_device_i2c(short i2c_id, struct i2c_board_info *devices, int nr_devices); -#else extern void __init at91_add_device_i2c(struct i2c_board_info *devices, int nr_devices); -#endif /* SPI */ extern void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices); |