Commit a0212796 authored by Tony Lindgren's avatar Tony Lindgren

Merge tag 'omap-cleanup-fixes-a-for-3.8' of...

Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers

Several fixes for build failures and sparse warnings in the
OMAP cleanup-headers branch.  Intended for 3.8 cleanup.

Basic build, boot, and PM test logs are available from here:

    http://www.pwsan.com/omap/testlogs/cleanup-headers-compile-fixes-3.8/20121026132711/

Due to underlying problems in v3.7-rc2, several tests fail.  These
failures are unrelated to these patches.
parents 2da8a79f 97af08b6
......@@ -32,6 +32,7 @@
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
static void fpga_mask_irq(struct irq_data *d)
{
......
......@@ -19,6 +19,8 @@
#include <linux/clk.h>
#include <linux/err.h>
#include "soc.h"
#ifdef CONFIG_PM_RUNTIME
static int omap1_pm_runtime_suspend(struct device *dev)
{
......
......@@ -445,13 +445,19 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
#else
int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
unsigned char *buffer, int offset,
size_t count);
size_t count)
{
return -ENOSYS;
}
int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
int offset, size_t count);
int offset, size_t count)
{
return -ENOSYS;
}
#endif
......@@ -549,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
#else
int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
unsigned char *buffer, int offset,
size_t count);
size_t count)
{
return -ENOSYS;
}
int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
int offset, size_t count);
int offset, size_t count)
{
return -ENOSYS;
}
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment