asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQivZpAAoJEBvUPslcq6VzTiQQAL/28kiWuI0LF0PXYXFsUmKM
 q1sSV7Ut/8dHoCQBalhTfyvwMvWLETojIT4gjAVnEIW17P8ftiEWmhG/Zu+JUi6z
 OsSj0JhKJ1RFFbb9zwm73vpShnjtBvZIM+UWTeUImhabd40GpkeOltCtQk6RcP90
 BARMk5Xr2xmtCQUkNCCxupO3mrulSOZRg+pB36KAaa2+sKhxvMrMLeKcXrT9EN37
 0lW1u6xuFeNKMgvoa7jB8uN4BR3xsEXBjEj6g3H/jGrJxQSYmueDzrRm7OqBr9Y7
 OyIK8fdoFcKsr8I9sJoJBg7mohbvE2NagHcvocX1Bns/9Ha29z4uu/iXwX+9OTuQ
 beFqMJURQ1sdV0i6fNGsnmB+x8m0sN3LOYHv0jJA1fmGxpe+pJ1q2MRWabO6jbJM
 TK0CmA+vcgE0XxDjvwpAyY9eO4OqYWKYo1ZzvwJYke12/gmnxD67cvaZ61boOgF2
 d9iJB7Odb6ovpsJaKlDeeXtU++aypkgPx8iKiosTOghwSldTW+NHQCQ2utL8rPwm
 ZZb2hYUCLI3sm9fBE2zIBYnQ5JRp6yPwua5s3URs3XGAn6t55PXc+ISG7hqBtNR8
 iPtJxH9AmV5wH84sWQ96G4mdGzZ1aDaQ7EZ7eqeOiam4QQMiRzKUYtyQ4R4XuLKr
 57RRZhPXOtKsDWrwQuOZ
 =qeS5
 -----END PGP SIGNATURE-----

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 4c98dc6b8e
  ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed4
  ARM: OMAP2+: fix build breakage introduced by commit b7754452b3
This commit is contained in:
Olof Johansson 2012-11-05 10:28:38 -08:00
commit 9237b5aa44
3 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-omap1/fpga.c
View file

@ -32,6 +32,7 @@
#include <mach/hardware.h>
#include "iomap.h"
#include "common.h"
static void fpga_mask_irq(struct irq_data *d)
{

2
arch/arm/mach-omap1/pm_bus.c
View file

@ -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)
{

36
drivers/mtd/onenand/omap2.c
View file

@ -445,13 +445,19 @@ out_copy:
#else
int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
unsigned char *buffer, int offset,
size_t count);
static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
unsigned char *buffer, int offset,
size_t count)
{
return -ENOSYS;
}
int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
int offset, size_t count);
static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
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,
unsigned char *buffer, int offset,
size_t count);
static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
unsigned char *buffer, int offset,
size_t count)
{
return -ENOSYS;
}
int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
int offset, size_t count);
static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
const unsigned char *buffer,
int offset, size_t count)
{
return -ENOSYS;
}
#endif