powerpc: fix typo #ifdef -> #ifndef

PATCH RESEND Applied Jochen Friedrich 2 participants 2 messages Nov 22, 2007 – Nov 25, 2007 Network drivers

Share & tools

Jochen Friedrich

author

2007-11-22 17:07 UTC #0 lore raw

PATCH RESEND 1/4 powerpc: fix typo #ifdef -> #ifndef

fpi->cp_command should be overwritten only if CONFIG_PPC_CPM_NEW_BINDING is NOT set. Otherwise it is already set from the device tree.

Signed-off-by Jochen Friedrich <[email protected]>

Cc Paul Mackerras <[email protected]>

Cc Benjamin Herrenschmidt <[email protected]>

Cc Jeff Garzik <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---
 drivers/net/fs_enet/mac-scc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/net/fs_enet/mac-scc.c +1 -1

index 03134f4..48f2f30 100644
@@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev)
 {
 	struct fs_enet_private *fep = netdev_priv(dev);
 
-#ifdef CONFIG_PPC_CPM_NEW_BINDING
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 	struct fs_platform_info *fpi = fep->fpi;
 
 	fep->scc.idx = fs_get_scc_index(fpi->fs_no);

Signature · 1 line

1.5.3.4

Vitaly Bordug

Applied

2007-11-25 20:38 UTC #1 lore raw

Quoted 9 lines · On Thu, 22 Nov 2007 17:53:47 +0100 Jochen Friedrich wrote:

fpi->cp_command should be overwritten only if CONFIG_PPC_CPM_NEW_BINDING is NOT set. Otherwise it is already set from the device tree.
Signed-off-by Jochen Friedrich <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

Applied to linux-2.6-8xx.git, for-paulus branch.

Signature · 1 line

Sincerely, Vitaly