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 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
board-sapphire.c
diff --git
a/arch/arm/mach-msm/board-sapphire.c
b/arch/arm/mach-msm/board-sapphire.c
index
dc0bcb5
..
32b4657
100644
(file)
--- a/
arch/arm/mach-msm/board-sapphire.c
+++ b/
arch/arm/mach-msm/board-sapphire.c
@@
-11,7
+11,7
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-
+#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/platform_device.h>
@@
-22,7
+22,6
@@
#include <linux/delay.h>
#include <linux/delay.h>
-#include <asm/gpio.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-77,8
+76,8
@@
static struct map_desc sapphire_io_desc[] __initdata = {
}
};
}
};
-static void __init sapphire_fixup(struct
machine_desc *desc, struct tag *tags
,
-
char **cmdline,
struct meminfo *mi)
+static void __init sapphire_fixup(struct
tag *tags, char **cmdline
,
+ struct meminfo *mi)
{
int smi_sz = parse_tag_smi((const struct tag *)tags);
{
int smi_sz = parse_tag_smi((const struct tag *)tags);