Module Name: src
Committed By: dyoung
Date: Thu Mar 4 22:33:12 UTC 2010
Modified Files:
src/sys/dev/cardbus: if_rtw_cardbus.c
Log Message:
Remove unnecessary #ifdef INET-enclosed #includes.
This is *always* compiled with #define rbus 1, so get rid of the
conditional compilation.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/if_rtw_cardbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/cardbus/if_rtw_cardbus.c
diff -u src/sys/dev/cardbus/if_rtw_cardbus.c:1.38 src/sys/dev/cardbus/if_rtw_cardbus.c:1.39
--- src/sys/dev/cardbus/if_rtw_cardbus.c:1.38 Fri Feb 26 01:12:56 2010
+++ src/sys/dev/cardbus/if_rtw_cardbus.c Thu Mar 4 22:33:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.38 2010/02/26 01:12:56 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.39 2010/03/04 22:33:12 dyoung Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.38 2010/02/26 01:12:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.39 2010/03/04 22:33:12 dyoung Exp $");
#include "opt_inet.h"
@@ -89,12 +89,6 @@
#include <net80211/ieee80211_radiotap.h>
#include <net80211/ieee80211_var.h>
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/if_inarp.h>
-#endif
-
-
#include <sys/bus.h>
#include <sys/intr.h>
@@ -246,10 +240,6 @@
RTW_DPRINTF(RTW_DEBUG_ATTACH,
("%s: %s mapped %" PRIuMAX " bytes mem space\n",
device_xname(self), __func__, (uintmax_t)regs->r_sz));
-#if rbus
-#else
- (*ct->ct_cf->cardbus_mem_open)(cc, 0, adr, adr+csc->sc_mapsize);
-#endif
csc->sc_csr |= PCI_COMMAND_MEM_ENABLE;
csc->sc_bar_reg = RTW_PCI_MMBA;
csc->sc_bar_val = adr | PCI_MAPREG_TYPE_MEM;
@@ -258,10 +248,6 @@
RTW_DPRINTF(RTW_DEBUG_ATTACH,
("%s: %s mapped %" PRIuMAX " bytes I/O space\n",
device_xname(self), __func__, (uintmax_t)regs->r_sz));
-#if rbus
-#else
- (*ct->ct_cf->cardbus_io_open)(cc, 0, adr, adr+csc->sc_mapsize);
-#endif
csc->sc_csr |= PCI_COMMAND_IO_ENABLE;
csc->sc_bar_reg = RTW_PCI_IOBA;
csc->sc_bar_val = adr | PCI_MAPREG_TYPE_IO;
