Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 75595
b: refs/heads/master
c: f6f2a5d
h: refs/heads/master
i:
  75593: a88d6a4
  75591: f296bf0
v: v3
  • Loading branch information
Daniel Walker authored and Tony Lindgren committed Jan 19, 2008
1 parent 221b3d9 commit 81fa824
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 496bcb81678ae255171de54e637ba1c19c9ed315
refs/heads/master: f6f2a5db6ddf164923c1f8af27d36c2d7ab994e0
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-omap1/board-nokia770.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
#include <asm/arch/omapfb.h>
#include <asm/arch/lcd_mipid.h>

#include "../plat-omap/dsp/dsp_common.h"

#define ADS7846_PENDOWN_GPIO 15

static void __init omap_nokia770_init_irq(void)
Expand Down Expand Up @@ -318,6 +316,8 @@ static __init int omap_dsp_init(void)
out:
return ret;
}
#else
#define omap_dsp_init() do {} while (0)
#endif /* CONFIG_OMAP_DSP */

static void __init omap_nokia770_init(void)
Expand Down

0 comments on commit 81fa824

Please sign in to comment.