diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 00:00:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 00:00:55 +0200 |
| commit | 1b57c7c2fbb81763cd4a6940c8530c98022c409c (patch) | |
| tree | f9d6af50dd1485ccdb4bcdafb3899564b6e4f36a /drivers/base/regmap/regcache.c | |
| parent | Merge tag 'mmc-v4.1' of git://git.linaro.org/people/ulf.hansson/mmc (diff) | |
| parent | regmap: Move tracing header into drivers/base/regmap (diff) | |
| download | linux-1b57c7c2fbb81763cd4a6940c8530c98022c409c.tar.xz linux-1b57c7c2fbb81763cd4a6940c8530c98022c409c.zip | |
Merge tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap update from Mark Brown:
"Just one patch for regmap this time around, a change from Steven
Rostedt to prettify the way we're making the regmap internal header
available to the trace events (it turns out that the trace subsystem
doesn't actually need to be in trace/events)"
* tag 'regmap-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Move tracing header into drivers/base/regmap
Diffstat (limited to 'drivers/base/regmap/regcache.c')
| -rw-r--r-- | drivers/base/regmap/regcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 87db9893b463..7eb7b3b98794 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -15,8 +15,8 @@ #include <linux/export.h> #include <linux/slab.h> #include <linux/sort.h> -#include <trace/events/regmap.h> +#include "trace.h" #include "internal.h" static const struct regcache_ops *cache_types[] = { |