Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9237b5aa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.8/cleanup-headers-part3-signed' of... 

Merge tag 'omap-for-v3.8/cleanup-headers-part3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers

From Tony Lindgren:

Here is the third set of plat header removal for omap2+.

This is based on the following minimal topic branches
coordinated with the related driver maintainers:

omap-for-v3.8/cleanup-headers-usb
omap-for-v3.8/cleanup-headers-menelaus

In addition to that, there are few fixes to the previously
merged patches that can show up with customized configs.

* tag 'omap-for-v3.8/cleanup-headers-part3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: fix sparse warning added by commit 4c98dc6b
  ARM: OMAP1: fix build breakage introduced by commit 25c7d49e
  ARM: OMAP2+: fix build breakage introduced by commit b7754452
parents 6c97a189 a0212796

arch/arm/mach-omap1/fpga.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <mach/hardware.h>



#include "iomap.h"

#include "common.h"



static void fpga_mask_irq(struct irq_data *d)

{

arch/arm/mach-omap1/pm_bus.c

+2 −0
Original line number Diff line number Diff line
@@ -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)

{

drivers/mtd/onenand/omap2.c

+24 −12
Original line number Diff line number Diff line
@@ -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