projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
hwmon
/
mr75203.c
diff --git
a/drivers/hwmon/mr75203.c
b/drivers/hwmon/mr75203.c
index
18da5a2
..
868243d
100644
(file)
--- a/
drivers/hwmon/mr75203.c
+++ b/
drivers/hwmon/mr75203.c
@@
-17,6
+17,7
@@
#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/reset.h>
#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/reset.h>
+#include <linux/units.h>
/* PVT Common register */
#define PVT_IP_CONFIG 0x04
/* PVT Common register */
#define PVT_IP_CONFIG 0x04
@@
-37,7
+38,6
@@
#define CLK_SYNTH_EN BIT(24)
#define CLK_SYS_CYCLES_MAX 514
#define CLK_SYS_CYCLES_MIN 2
#define CLK_SYNTH_EN BIT(24)
#define CLK_SYS_CYCLES_MAX 514
#define CLK_SYS_CYCLES_MIN 2
-#define HZ_PER_MHZ 1000000L
#define SDIF_DISABLE 0x04
#define SDIF_DISABLE 0x04