The patch titled
fb-sm501-framebuffer-driver-5-fix
has been removed from the -mm tree. Its filename was
fb-sm501-framebuffer-driver-5-fix.patch
This patch was dropped because it was folded into fb-sm501-framebuffer-driver-5.patch
------------------------------------------------------
Subject: fb-sm501-framebuffer-driver-5-fix
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
drivers/video/sm501fb.c:1105: warning: initialization from incompatible pointer type
drivers/video/sm501fb.c:1105: warning: initialization from incompatible pointer type
drivers/video/sm501fb.c:1141: warning: initialization from incompatible pointer type
drivers/video/sm501fb.c:1160: warning: initialization from incompatible pointer type
Cc: Ben Dooks <ben-linux@xxxxxxxxx>
Cc: Vincent Sanders <vince@xxxxxxxxxxxxxxxx>
Cc: James Simmons <jsimmons@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/sm501fb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/video/sm501fb.c~fb-sm501-framebuffer-driver-5-fix drivers/video/sm501fb.c
--- a/drivers/video/sm501fb.c~fb-sm501-framebuffer-driver-5-fix
+++ a/drivers/video/sm501fb.c
@@ -1046,7 +1046,7 @@ int sm501fb_cursor(struct fb_info *info,
* device attribute code to show where the crt output is sourced from
*/
-static int sm501fb_crtsrc_show(struct device *dev,
+static ssize_t sm501fb_crtsrc_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct sm501fb_info *info = dev_get_drvdata(dev);
@@ -1063,7 +1063,7 @@ static int sm501fb_crtsrc_show(struct de
* device attribute code to set where the crt output is sourced from
*/
-static int sm501fb_crtsrc_store(struct device *dev,
+static ssize_t sm501fb_crtsrc_store(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
@@ -1126,7 +1126,7 @@ static int sm501fb_show_regs(struct sm50
* show the crt control and cursor registers
*/
-static int sm501fb_debug_show_crt(struct device *dev,
+static ssize_t sm501fb_debug_show_crt(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct sm501fb_info *info = dev_get_drvdata(dev);
@@ -1145,7 +1145,7 @@ static DEVICE_ATTR(fbregs_crt, 0444, sm5
* show the panel control and cursor registers
*/
-static int sm501fb_debug_show_pnl(struct device *dev,
+static ssize_t sm501fb_debug_show_pnl(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct sm501fb_info *info = dev_get_drvdata(dev);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
xfs-warning-fix.patch
rework-reserved-major-handling.patch
mincore-warning-fix.patch
kprobes-list-all-active-probes-in-the-system.patch
add-epoll-compat-code-to-kernel-compatc.patch
genalloc-warning-fixes.patch
fb-sm501-framebuffer-driver-5.patch
fb-sm501-framebuffer-driver-5-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
