From: Steve Sakoman <sakoman@gmail.com>
Date: Thu, 23 Apr 2009 19:45:44 +0000 (-0700)
Subject: ARM: OMAP: Fix merge errors in board-overo.c
X-Git-Tag: v2.6.32-omap1~11^2^2~1^2^2^2^2^2~8^2^2~18^2~2^2^2~2^2^2^2^2~16^2^2~8^2^2~7^2~163^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c42e73b956f346cb9a0b3afb064f69afc4761d2a;p=pandora-kernel.git

ARM: OMAP: Fix merge errors in board-overo.c

One line was omitted when moving definitions from board-overo.h to
board-overo.c, and a duplicate overo_init_smsc911x call was added to
overo_init.

The former results in a compiler error.

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed