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 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
devices.c
diff --git
a/arch/arm/mach-omap1/devices.c
b/arch/arm/mach-omap1/devices.c
index
e7f9ee6
..
b0f4c23
100644
(file)
--- a/
arch/arm/mach-omap1/devices.c
+++ b/
arch/arm/mach-omap1/devices.c
@@
-17,6
+17,7
@@
#include <linux/io.h>
#include <linux/spi/spi.h>
#include <linux/io.h>
#include <linux/spi/spi.h>
+#include <mach/camera.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <mach/hardware.h>
#include <asm/mach/map.h>
@@
-287,6
+288,9
@@
static inline void omap_init_audio(void) {}
*/
static int __init omap1_init_devices(void)
{
*/
static int __init omap1_init_devices(void)
{
+ if (!cpu_class_is_omap1())
+ return -ENODEV;
+
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/
/* please keep these calls, and their implementations above,
* in alphabetical order so they're easier to sort through.
*/