Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932381AbaKMJdN (ORCPT ); Thu, 13 Nov 2014 04:33:13 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:46643 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932197AbaKMJdL (ORCPT ); Thu, 13 Nov 2014 04:33:11 -0500 From: Nicolas Ferre To: CC: , Boris BREZILLON , Alexandre Belloni , Jean-Christophe PLAGNIOL-VILLARD , , Nicolas Ferre Subject: [PATCH] ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option Date: Thu, 13 Nov 2014 10:33:10 +0100 Message-ID: <1415871190-32244-1-git-send-email-nicolas.ferre@atmel.com> X-Mailer: git-send-email 1.8.2.2 In-Reply-To: <1415617517.4862.44.camel@x220> References: <1415617517.4862.44.camel@x220> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/Makefile.boot | 6 ------ arch/arm/mach-at91/board.h | 4 ---- 2 files changed, 10 deletions(-) diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot index 5309f9b6aabc..29ed0fa374ca 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 836e9a537e0c..d268ec3781dd 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); -- 1.8.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/