diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 10:28:38 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 10:28:38 -0800 |
| commit | 9237b5aa447dce55913b61f435c5140410bf5310 (patch) | |
| tree | e107fbd74e98b301bfb8c964443c6c86a0f609a3 /drivers | |
| parent | 6c97a189592fadaa928aa3e6c673e061823f1597 (diff) | |
| parent | a0212796b58061a9716178d261f318925c246643 (diff) | |
| download | op-kernel-dev-9237b5aa447dce55913b61f435c5140410bf5310.zip op-kernel-dev-9237b5aa447dce55913b61f435c5140410bf5310.tar.gz | |
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 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/onenand/omap2.c | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 53069ae..99f96e1 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -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 |
