diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /arch/arm/mach-tegra/board-cardhu-powermon.c | |
parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu-powermon.c')
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-powermon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-powermon.c b/arch/arm/mach-tegra/board-cardhu-powermon.c index 823cddbabeb3..bffd51b1ea84 100644 --- a/arch/arm/mach-tegra/board-cardhu-powermon.c +++ b/arch/arm/mach-tegra/board-cardhu-powermon.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu-powermon.c * - * Copyright (c) 2011, NVIDIA, All Rights Reserved. + * Copyright (c) 2011-2013, NVIDIA, All Rights Reserved. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -249,7 +249,7 @@ int __init cardhu_pmon_init(void) &power_mon_info[VDD_CORE_IN]; } - if (bi.board_id != BOARD_PM269) { + if (bi.board_id != BOARD_PM269 && bi.board_id != BOARD_PM315) { i2c_register_board_info(0, cardhu_i2c0_ina219_board_info, ARRAY_SIZE(cardhu_i2c0_ina219_board_info)); } |