diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-29 07:51:47 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-10-29 20:43:28 -0700 |
commit | 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a (patch) | |
tree | 83fea421302411a92023b74545b454c4c24212ef /drivers/staging/bcm/headers.h | |
parent | 2e44f765dfd3a8592c2d6b6005be061eccdee137 (diff) | |
download | linux-91d29ee1a82fedcd7d1bbf24007b31a49c47e90a.tar.bz2 |
beceem: remove ifdef's
There were a lot of ifdef's for driver options which have no
configuration options. Choose the current value and remove the
ifdef.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Diffstat (limited to 'drivers/staging/bcm/headers.h')
-rw-r--r-- | drivers/staging/bcm/headers.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h index 9d4e3aca1b34..5867db5d0074 100644 --- a/drivers/staging/bcm/headers.h +++ b/drivers/staging/bcm/headers.h @@ -41,21 +41,7 @@ #endif #include <linux/tcp.h> #include <linux/udp.h> -#ifndef BCM_SHM_INTERFACE #include <linux/usb.h> -#endif -#ifdef BECEEM_TARGET - -#include <mac_common.h> -#include <msg_Dsa.h> -#include <msg_Dsc.h> -#include <msg_Dsd.h> -#include <sch_definitions.h> -using namespace Beceem; -#ifdef ENABLE_CORRIGENDUM2_UPDATE -extern B_UINT32 g_u32Corr2MacFlags; -#endif -#endif #include "Typedefs.h" #include "Version.h" @@ -80,7 +66,6 @@ extern B_UINT32 g_u32Corr2MacFlags; #include "Queue.h" #include "vendorspecificextn.h" -#ifndef BCM_SHM_INTERFACE #include "InterfaceMacros.h" #include "InterfaceAdapter.h" @@ -89,21 +74,8 @@ extern B_UINT32 g_u32Corr2MacFlags; #include "InterfaceMisc.h" #include "InterfaceRx.h" #include "InterfaceTx.h" -#endif #include "InterfaceIdleMode.h" #include "InterfaceInit.h" -#ifdef BCM_SHM_INTERFACE -#include <linux/cpe_config.h> - -#ifdef GDMA_INTERFACE -#include "GdmaInterface.h" -#include "symphony.h" -#else -#include "virtual_interface.h" - -#endif - -#endif #endif |