summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300/i2c.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-08-13 10:11:15 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-08-13 13:53:04 +0200
commitfcb28d2e9db7f1fc146a6e95200f166a86224066 (patch)
tree37e94239af87349e6463ad0d2cfdfc8d1ce22e3f /arch/arm/mach-u300/i2c.c
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
ARM: u300: retire ancient platforms
This retires the B26/S26, B330/S330 and B365/S365 boards from the U300 platform. The only board really used anywhere today is the S335 so let's concentrate any efforts on that one board. Also the board variants are selected at compile-time, which is strictly a no-no these days, if multi-board support is to be brought back it need to happen using run-time and device tree. My work on ARM Linux started on the B26/S26 so it's a bit sad to see it go, but there is a time to move on with all things in life. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/i2c.c')
-rw-r--r--arch/arm/mach-u300/i2c.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c
index cb04bd6ab3e..0d4620ed853 100644
--- a/arch/arm/mach-u300/i2c.c
+++ b/arch/arm/mach-u300/i2c.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-u300/i2c.c
*
- * Copyright (C) 2009 ST-Ericsson AB
+ * Copyright (C) 2009-2012 ST-Ericsson AB
* License terms: GNU General Public License (GPL) version 2
*
* Register board i2c devices
@@ -261,7 +261,6 @@ static struct i2c_board_info __initdata bus0_i2c_board_info[] = {
};
static struct i2c_board_info __initdata bus1_i2c_board_info[] = {
-#ifdef CONFIG_MACH_U300_BS335
{
.type = "fwcam",
.addr = 0x10,
@@ -270,9 +269,6 @@ static struct i2c_board_info __initdata bus1_i2c_board_info[] = {
.type = "fwcam",
.addr = 0x5d,
},
-#else
- { },
-#endif
};
void __init u300_i2c_register_board_devices(void)