The patch titled
gregkh-usb-usb-sisusbvga-possible-cleanups fix
has been added to the -mm tree. Its filename is
gregkh-usb-usb-sisusbvga-possible-cleanups-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: gregkh-usb-usb-sisusbvga-possible-cleanups fix
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Fix build errors caused by aggressive static attributes.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Cc: Adrian Bunk <bunk@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/misc/sisusbvga/sisusb.c | 15 ---------------
drivers/usb/misc/sisusbvga/sisusb.h | 2 --
2 files changed, 17 deletions(-)
diff -puN drivers/usb/misc/sisusbvga/sisusb.c~gregkh-usb-usb-sisusbvga-possible-cleanups-fix drivers/usb/misc/sisusbvga/sisusb.c
--- devel/drivers/usb/misc/sisusbvga/sisusb.c~gregkh-usb-usb-sisusbvga-possible-cleanups-fix 2006-06-06 00:47:56.000000000 -0700
+++ devel-akpm/drivers/usb/misc/sisusbvga/sisusb.c 2006-06-06 00:47:56.000000000 -0700
@@ -1331,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *si
}
#endif
-#ifndef INCL_SISUSB_CON
-static
-#endif
int
sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
{
@@ -1343,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data
return ret;
}
-#ifndef INCL_SISUSB_CON
-static
-#endif
int
sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
{
@@ -1355,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data
return ret;
}
-#ifndef INCL_SISUSB_CON
-static
-#endif
int
sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,
u8 myand, u8 myor)
@@ -1387,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_d
return ret;
}
-#ifndef INCL_SISUSB_CON
-static
-#endif
int
sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor)
{
return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor));
}
-#ifndef INCL_SISUSB_CON
-static
-#endif
int
sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand)
{
diff -puN drivers/usb/misc/sisusbvga/sisusb.h~gregkh-usb-usb-sisusbvga-possible-cleanups-fix drivers/usb/misc/sisusbvga/sisusb.h
--- devel/drivers/usb/misc/sisusbvga/sisusb.h~gregkh-usb-usb-sisusbvga-possible-cleanups-fix 2006-06-06 00:47:56.000000000 -0700
+++ devel-akpm/drivers/usb/misc/sisusbvga/sisusb.h 2006-06-06 00:47:56.000000000 -0700
@@ -62,11 +62,9 @@
#define INCL_SISUSB_CON 1
#endif
-#ifdef INCL_SISUSB_CON
#include <linux/console.h>
#include <linux/vt_kern.h>
#include "sisusb_struct.h"
-#endif
/* USB related */
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
git-infiniband.patch
config-exit-if-no-beginning-filename.patch
git-mtd.patch
git-pcmcia.patch
lpfc-sparse-null-warnings.patch
aic7-cleanup-module_parm_desc-strings.patch
qla1280-fix-section-mismatch-warnings.patch
areca-raid-linux-scsi-driver.patch
gregkh-usb-usb-sisusbvga-possible-cleanups-fix.patch
git-watchdog.patch
alpha-generic-hweight-build-fix.patch
add-poisonh-and-patch-primary-users.patch
update-2-drivers-for-poisonh.patch
poison-add-use-more-constants.patch
add-doc-submitchecklist.patch
doc-add-audit-acct-to-docbook.patch
ip2-fix-sections.patch
codingstyle-add-typedefs-chapter.patch
fix-listh-kernel-doc.patch
listh-doc-change-counter-to-control.patch
kernel-doc-drop-leading-space-in-sections.patch
kernel-doc-script-cleanups.patch
wd7000-fix-section-mismatch-warnings.patch
megaraid_mbox-fix-section-mismatch-warnings.patch
kernel-doc-mm-readhead-fixup.patch
pi-futex-rt-mutex-docs-update.patch
acpi-identify-which-device-is-not-power-manageable.patch
acpi-identify-which-device-is-not-power-manageable-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
