The patch titled
] pcmcia: ti113x: fix ENE_TEST_C9_PFENABLE definition
has been added to the -mm tree. Its filename is
pcmcia-ti113x-fix-ene_test_c9_pfenable-definition.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ] pcmcia: ti113x: fix ENE_TEST_C9_PFENABLE definition
From: Roel Kluin <roel.kluin@xxxxxxxxx>
This code was added in commit 8c3520d4eb3b1bbf2e45fbae8dcfb8db06d5e775
Is the replacement below correct, or should the second ENE_TEST_C9_PFENABLE_F0
be removed? The patch below assumes the former is correct.
Signed-off-by: Roel Kluin <roel.kluin@xxxxxxxxx>
Cc: Daniel Ritz <daniel.ritz@xxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pcmcia/ti113x.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/pcmcia/ti113x.h~pcmcia-ti113x-fix-ene_test_c9_pfenable-definition drivers/pcmcia/ti113x.h
--- a/drivers/pcmcia/ti113x.h~pcmcia-ti113x-fix-ene_test_c9_pfenable-definition
+++ a/drivers/pcmcia/ti113x.h
@@ -155,7 +155,7 @@
#define ENE_TEST_C9_TLTENABLE 0x02
#define ENE_TEST_C9_PFENABLE_F0 0x04
#define ENE_TEST_C9_PFENABLE_F1 0x08
-#define ENE_TEST_C9_PFENABLE (ENE_TEST_C9_PFENABLE_F0 | ENE_TEST_C9_PFENABLE_F0)
+#define ENE_TEST_C9_PFENABLE (ENE_TEST_C9_PFENABLE_F0 | ENE_TEST_C9_PFENABLE_F1)
#define ENE_TEST_C9_WPDISALBLE_F0 0x40
#define ENE_TEST_C9_WPDISALBLE_F1 0x80
#define ENE_TEST_C9_WPDISALBLE (ENE_TEST_C9_WPDISALBLE_F0 | ENE_TEST_C9_WPDISALBLE_F1)
_
Patches currently in -mm which might be from roel.kluin@xxxxxxxxx are
ipg-fix-receivemode-ipg_rm_receivemulticasthash-in-ipg_nic_set_multicast_list.patch
wireless-airo-waitbusy-wont-delay.patch
wireless-airo-waitbusy-wont-delay-checkpatch-fixes.patch
pcmcia-ti113x-fix-ene_test_c9_pfenable-definition.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
