diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-10-05 13:31:43 -0700 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-10-05 13:31:43 -0700 | 
| commit | a9f82d10d1c20b433a12b08e6e78bced6f596c5f (patch) | |
| tree | f92ff332d48352ec0ffa7e3eba27778a8c4cdce2 /fs/jbd/commit.c | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
omap: Fix incorrect 730 vs 850 detection
Commit cd92204924fafbd5c7241dfd12ca3176d542e0c5 added
support for omap850. However, the patch accidentally
removed the wrong ifdef:
 #  define cpu_is_omap730()		1
 # endif
 #endif
+#else
+# if defined(CONFIG_ARCH_OMAP850)
+#  undef  cpu_is_omap850
+#  define cpu_is_omap850()		1
+# endif
+#endif
...
 void omap2_check_revision(void);
 #endif    /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */
-
-#endif
Instead of removing removing the #endif at the end of the file,
the #endif before #else should have been removed.
But we cannot have multiple #else statements as pointed out by
Alistair Buxton <a.j.buxton@gmail.com>. So the fix is to:
- remove the non-multi-omap special handling, as we need to
  detect between omap730 and omap850 anyways.
- add the missing #endif back to the end of the file
Reported-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'fs/jbd/commit.c')
0 files changed, 0 insertions, 0 deletions
