- pcmcia-ti113x-fix-ene_test_c9_pfenable-definition.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     pcmcia: ti113x: fix ENE_TEST_C9_PFENABLE definition
has been removed from the -mm tree.  Its filename was
     pcmcia-ti113x-fix-ene_test_c9_pfenable-definition.patch

This patch was dropped because it was merged into mainline or a subsystem tree

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:

  commit 8c3520d4eb3b1bbf2e45fbae8dcfb8db06d5e775
  Author: Daniel Ritz <daniel.ritz@xxxxxx>
  Date:   Sun Aug 21 22:29:26 2005 -0700

    [PATCH] yenta: auto-tune EnE bridges for CardBus cards


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
fec_mpc52xx-mpc52xx_messages_default-2nd-netif_msg_ifdown-=-ifup.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux