projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/devm', 'asoc/topic/fsl', 'asoc/topic/fsl...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
board-rx51-video.c
diff --git
a/arch/arm/mach-omap2/board-rx51-video.c
b/arch/arm/mach-omap2/board-rx51-video.c
index
43a90c8
..
9cfebc5
100644
(file)
--- a/
arch/arm/mach-omap2/board-rx51-video.c
+++ b/
arch/arm/mach-omap2/board-rx51-video.c
@@
-48,7
+48,7
@@
static struct omap_dss_board_info rx51_dss_board_info = {
static int __init rx51_video_init(void)
{
- if (!machine_is_nokia_rx51()
&& !of_machine_is_compatible("nokia,omap3-n900")
)
+ if (!machine_is_nokia_rx51())
return 0;
if (omap_mux_init_gpio(RX51_LCD_RESET_GPIO, OMAP_PIN_OUTPUT)) {