Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (94 commits)
  genetlink: fix netns vs. netlink table locking (2)
  3c59x: Get rid of "Trying to free already-free IRQ"
  tunnel: eliminate recursion field
  ems_pci: fix size of CAN controllers BAR mapping for CPC-PCI v2
  net: fix htmldocs sunrpc, clnt.c
  Phonet: error on broadcast sending (unimplemented)
  Phonet: fix race for port number in concurrent bind()
  pktgen: better scheduler friendliness
  pktgen: T_TERMINATE flag is unused
  ipv4: check optlen for IP_MULTICAST_IF option
  ath9k: Initialize txgain and rxgain for newer AR9287 chipsets.
  iwlagn: fix panic in iwl{5000,4965}_rx_reply_tx
  ath9k: Fix RFKILL bugs
  drivers/net/wireless: Use usb_endpoint_dir_out
  cfg80211: don't overwrite privacy setting
  wl12xx: fix kconfig/link errors
  rt2x00: fix the definition of rt2x00crypto_rx_insert_iv
  iwlwifi: reduce noise when skb allocation fails
  iwlwifi: do not send sync command while holding spinlock
  mac80211: fix DTIM setting
  ...

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index dc22782633a5..83a044dbd1d7 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -134,18 +134,15 @@ static void xemaclite_enable_interrupts(struct net_local *drvdata)
         }
 
         /* Enable the Rx interrupts for the first buffer */
-        reg_data = in_be32(drvdata->base_addr + XEL_RSR_OFFSET);
         out_be32(drvdata->base_addr + XEL_RSR_OFFSET,
-                 reg_data | XEL_RSR_RECV_IE_MASK);
+                 XEL_RSR_RECV_IE_MASK);
 
         /* Enable the Rx interrupts for the second Buffer if
          * configured in HW */
         if (drvdata->rx_ping_pong != 0) {
-                reg_data = in_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
-                                   XEL_RSR_OFFSET);
                 out_be32(drvdata->base_addr + XEL_BUFFER_OFFSET +
                          XEL_RSR_OFFSET,
-                         reg_data | XEL_RSR_RECV_IE_MASK);
+                         XEL_RSR_RECV_IE_MASK);
         }
 
         /* Enable the Global Interrupt Enable */