summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorVaibhav Bedia <vaibhav.bedia@ti.com>2012-12-19 06:53:10 +0000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 08:43:25 -0800
commit1800098549fc310cffffefdcb3722adaad0edda8 (patch)
treed06309a28a917e52bfd88d5711b312bc5f00bde3 /arch
parentb7dfde956daee23f4439d0c8562a5e38b43e79d9 (diff)
downloadop-kernel-dev-1800098549fc310cffffefdcb3722adaad0edda8.zip
op-kernel-dev-1800098549fc310cffffefdcb3722adaad0edda8.tar.gz
ARM: OMAP: Fix build breakage due to missing include in i2c.c
Merge commit 752451f01c45 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux") resulted in a build breakage for OMAP arch/arm/mach-omap2/i2c.c: In function 'omap_pm_set_max_mpu_wakeup_lat_compat': arch/arm/mach-omap2/i2c.c:130:2: error: implicit declaration of function 'omap_pm_set_max_mpu_wakeup_lat' make[1]: *** [arch/arm/mach-omap2/i2c.o] Error 1 Fix this by including the appropriate header file with the function prototype. Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/i2c.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index df6d6acb..b9074dd 100644
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -22,6 +22,7 @@
#include "soc.h"
#include "omap_hwmod.h"
#include "omap_device.h"
+#include "omap-pm.h"
#include "prm.h"
#include "common.h"
OpenPOWER on IntegriCloud