summaryrefslogtreecommitdiffstats
path: root/arch/arm/boards/karo-tx6x/board.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:07 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-01-11 13:11:07 +0100
commit70ef1cef5c1a03a4b130f3916d47c3076880b5d6 (patch)
treecc0faaf8e07a08600f9b958850d7f7669c0ae02d /arch/arm/boards/karo-tx6x/board.c
parente64f16cf34175d9e662edfaa02bc7895c1b50b96 (diff)
parent9e617362fc300d31a4e7f6c5b72781b58c03f78a (diff)
downloadbarebox-70ef1cef5c1a03a4b130f3916d47c3076880b5d6.tar.gz
barebox-70ef1cef5c1a03a4b130f3916d47c3076880b5d6.tar.xz
Merge branch 'for-next/pstore'
Diffstat (limited to 'arch/arm/boards/karo-tx6x/board.c')
-rw-r--r--arch/arm/boards/karo-tx6x/board.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c
index 6d9dd9a505..a921541bfc 100644
--- a/arch/arm/boards/karo-tx6x/board.c
+++ b/arch/arm/boards/karo-tx6x/board.c
@@ -21,6 +21,7 @@
#include <init.h>
#include <i2c/i2c.h>
#include <linux/clk.h>
+#include <linux/kernel.h>
#include <environment.h>
#include <mach/bbu.h>
#include <mach/imx6.h>
@@ -29,7 +30,6 @@
#define ETH_PHY_RST IMX_GPIO_NR(7, 6)
#define ETH_PHY_PWR IMX_GPIO_NR(3, 20)
#define ETH_PHY_INT IMX_GPIO_NR(7, 1)
-#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
#define DIV_ROUND(n,d) (((n) + ((d)/2)) / (d))
#define LTC3676_BUCK1 0x01