diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 16:57:39 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 16:57:39 -0400 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /drivers/gpio/Makefile | |
| parent | 12610be33df5563d3f8cb141f231d4dc5b2a317f (diff) | |
| parent | df2212270ce94f12e9caed6ca04c7077672d588e (diff) | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'drivers/gpio/Makefile')
| -rw-r--r-- | drivers/gpio/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 68e3bfd35e0f..0fbdd75996e3 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile | |||
| @@ -43,6 +43,7 @@ obj-$(CONFIG_GPIO_SCH) += gpio-sch.o | |||
| 43 | obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o | 43 | obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o |
| 44 | obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o | 44 | obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o |
| 45 | obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o | 45 | obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o |
| 46 | obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o | ||
| 46 | obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o | 47 | obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o |
| 47 | obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o | 48 | obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o |
| 48 | obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o | 49 | obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o |