git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur...
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
omap_device.c
diff --git
a/arch/arm/plat-omap/omap_device.c
b/arch/arm/plat-omap/omap_device.c
index
cd90bed
..
e8d9869
100644
(file)
--- a/
arch/arm/plat-omap/omap_device.c
+++ b/
arch/arm/plat-omap/omap_device.c
@@
-78,6
+78,7
@@
#undef DEBUG
#include <linux/kernel.h>
#undef DEBUG
#include <linux/kernel.h>
+#include <linux/export.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/err.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/err.h>
@@
-426,7
+427,7
@@
static int _omap_device_notifier_call(struct notifier_block *nb,
* return the context loss counter for that hwmod, otherwise return
* zero.
*/
* return the context loss counter for that hwmod, otherwise return
* zero.
*/
-
u32
omap_device_get_context_loss_count(struct platform_device *pdev)
+
int
omap_device_get_context_loss_count(struct platform_device *pdev)
{
struct omap_device *od;
u32 ret = 0;
{
struct omap_device *od;
u32 ret = 0;