The patch titled
amd8111e: fix more bustage
has been removed from the -mm tree. Its filename was
potential-parse-error-in-ifdef-fix.patch
This patch was dropped because it was folded into potential-parse-error-in-ifdef.patch
------------------------------------------------------
Subject: amd8111e: fix more bustage
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
drivers/net/amd8111e.c: In function 'amd8111e_write_phy':
drivers/net/amd8111e.c:159: warning: ISO C90 forbids mixed declarations and code
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Yoann Padioleau <padator@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/amd8111e.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/amd8111e.c~potential-parse-error-in-ifdef-fix drivers/net/amd8111e.c
diff -puN drivers/net/amd8111e.h~potential-parse-error-in-ifdef-fix drivers/net/amd8111e.h
--- a/drivers/net/amd8111e.h~potential-parse-error-in-ifdef-fix
+++ a/drivers/net/amd8111e.h
@@ -615,7 +615,7 @@ typedef enum {
#define SSTATE 2
/* Assume contoller gets data 10 times the maximum processing time */
-#define REPEAT_CNT 10;
+#define REPEAT_CNT 10
/* amd8111e decriptor flag definitions */
typedef enum {
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
potential-parse-error-in-ifdef.patch
potential-parse-error-in-ifdef-fix.patch
potential-parse-error-in-ifdef-update.patch
aacraid-fix-shutdown-handler-to-also-disable-interrupts.patch
alpha-support-graphics-on-non-zero-pci-domains-fix.patch
alpha-support-graphics-on-non-zero-pci-domains-fix-2.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
