diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-10-23 00:19:18 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:52:34 -0800 |
| commit | 6b8121f30d001e2cbae6ede6822f70c73dc3100a (patch) | |
| tree | 32edee2c1d52b1d3390805fb1950537e84d07d2f /drivers/gpio | |
| parent | c788a318f6d5e8ebf44286fedddad6c15c4a617c (diff) | |
HACK merge fixups for compile
Rebase-Id: Rbc628711479b187a90437bea94776066c7a58b54
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-tegra.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index 94da36eadcf9..d1ad4d415a19 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -32,9 +32,10 @@ #include <asm/mach/irq.h> #include <mach/iomap.h> -#include "pm-irq.h" #include <mach/pinmux.h> +#include "../../../arch/arm/mach-tegra/pm-irq.h" + #define GPIO_BANK(x) ((x) >> 5) #define GPIO_PORT(x) (((x) >> 3) & 0x3) #define GPIO_BIT(x) ((x) & 0x7) |