diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:32:22 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-26 16:32:22 -0400 |
commit | 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 (patch) | |
tree | e696fcf3eb3b9c6311fc4fa51aa8c89a29aad9c2 /drivers | |
parent | 8634155ef41d3a035f2ea0b6c5bed2806f2788bc (diff) | |
parent | a0212796b58061a9716178d261f318925c246643 (diff) |
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/menelaus.c | 2 | ||||
-rw-r--r-- | drivers/mtd/onenand/omap2.c | 36 |
2 files changed, 25 insertions, 13 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d589981412..998ce8cb3065 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
@@ -41,11 +41,11 @@ | |||
41 | #include <linux/rtc.h> | 41 | #include <linux/rtc.h> |
42 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/mfd/menelaus.h> | ||
44 | 45 | ||
45 | #include <asm/mach/irq.h> | 46 | #include <asm/mach/irq.h> |
46 | 47 | ||
47 | #include <asm/gpio.h> | 48 | #include <asm/gpio.h> |
48 | #include <plat/menelaus.h> | ||
49 | 49 | ||
50 | #define DRIVER_NAME "menelaus" | 50 | #define DRIVER_NAME "menelaus" |
51 | 51 | ||
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 53069aef1f48..99f96e19ebea 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
@@ -445,13 +445,19 @@ out_copy: | |||
445 | 445 | ||
446 | #else | 446 | #else |
447 | 447 | ||
448 | int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, | 448 | static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, |
449 | unsigned char *buffer, int offset, | 449 | unsigned char *buffer, int offset, |
450 | size_t count); | 450 | size_t count) |
451 | { | ||
452 | return -ENOSYS; | ||
453 | } | ||
451 | 454 | ||
452 | int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, | 455 | static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, |
453 | const unsigned char *buffer, | 456 | const unsigned char *buffer, |
454 | int offset, size_t count); | 457 | int offset, size_t count) |
458 | { | ||
459 | return -ENOSYS; | ||
460 | } | ||
455 | 461 | ||
456 | #endif | 462 | #endif |
457 | 463 | ||
@@ -549,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, | |||
549 | 555 | ||
550 | #else | 556 | #else |
551 | 557 | ||
552 | int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, | 558 | static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area, |
553 | unsigned char *buffer, int offset, | 559 | unsigned char *buffer, int offset, |
554 | size_t count); | 560 | size_t count) |
561 | { | ||
562 | return -ENOSYS; | ||
563 | } | ||
555 | 564 | ||
556 | int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, | 565 | static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area, |
557 | const unsigned char *buffer, | 566 | const unsigned char *buffer, |
558 | int offset, size_t count); | 567 | int offset, size_t count) |
568 | { | ||
569 | return -ENOSYS; | ||
570 | } | ||
559 | 571 | ||
560 | #endif | 572 | #endif |
561 | 573 | ||