diff options
| author | Jon Medhurst <tixy@linaro.org> | 2012-05-10 17:35:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-21 22:30:53 -0500 |
| commit | 43bc6d5b076e30d55b59daedeb205063cb6e54a2 (patch) | |
| tree | fe633570f7a3a0b8222d53ae5f6c01b51dc3d5d5 | |
| parent | e49849053ac342ce82c92aa0d2244e4767fd1fbb (diff) | |
gator: Add config for building the module in-tree
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Conflicts:
drivers/Kconfig
drivers/Makefile
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/gator/Kconfig | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index b3138fbb46a4..c1e4021f4362 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -170,4 +170,6 @@ source "drivers/phy/Kconfig" source "drivers/powercap/Kconfig" +source "drivers/gator/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 8e3b8b06c0b2..7edd884f2b5a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -155,3 +155,5 @@ obj-$(CONFIG_IPACK_BUS) += ipack/ obj-$(CONFIG_NTB) += ntb/ obj-$(CONFIG_FMC) += fmc/ obj-$(CONFIG_POWERCAP) += powercap/ + +obj-$(CONFIG_GATOR) += gator/ diff --git a/drivers/gator/Kconfig b/drivers/gator/Kconfig index e46ccb9b8064..31f0c6fb8bae 100644 --- a/drivers/gator/Kconfig +++ b/drivers/gator/Kconfig @@ -3,7 +3,6 @@ config GATOR default m if (ARM || ARM64) depends on PROFILING depends on HIGH_RES_TIMERS - depends on LOCAL_TIMERS || !(ARM && SMP) depends on PERF_EVENTS depends on HW_PERF_EVENTS || !(ARM || ARM64) select TRACING |