diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:44:18 -0400 |
| commit | 43872fa788060eef91ae437957e0a5e39f1c56fd (patch) | |
| tree | dba464da61167d84b4f7470edebd5a769a78f9ee /drivers/mfd/menelaus.c | |
| parent | 91fed558d0f33c74477569f50ed883fe6d430f1f (diff) | |
| parent | f55be1bf52aad524dc1bf556ae26c90262c87825 (diff) | |
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/mfd/menelaus.c')
| -rw-r--r-- | drivers/mfd/menelaus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 9cee8e7f0bc..af5d9d06137 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | #include <asm/mach/irq.h> | 45 | #include <asm/mach/irq.h> |
| 46 | 46 | ||
| 47 | #include <mach/gpio.h> | 47 | #include <asm/gpio.h> |
| 48 | #include <plat/menelaus.h> | 48 | #include <plat/menelaus.h> |
| 49 | 49 | ||
| 50 | #define DRIVER_NAME "menelaus" | 50 | #define DRIVER_NAME "menelaus" |