Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realm...

[~andy/linux] / drivers / staging / silicom / bypasslib / bplibk.h

diff --git a/drivers/staging/silicom/bypasslib/bplibk.h b/drivers/staging/silicom/bypasslib/bplibk.h
index bf062c4ec9533126a67b3cb1bba0771699aaa3ed..c5c75c4fe055bf87f44875e1fcd36d0ee6e525ac 100644 (file)
--- a/drivers/staging/silicom/bypasslib/bplibk.h
+++ b/drivers/staging/silicom/bypasslib/bplibk.h
@@ -24,15 +24,13 @@
 #define INTEL_PEG4BPFII_PID 0x10a1
 
 #define PEGII_IF_SERIES(vid, pid) \
-       ((vid == 0x8086)&& \
-        ((pid == INTEL_PEG4BPII_PID)||   \
+       ((vid == 0x8086) && \
+        ((pid == INTEL_PEG4BPII_PID) ||   \
          (pid == INTEL_PEG4BPFII_PID)))
 
-#define EXPORT_SYMBOL_NOVERS EXPORT_SYMBOL
-
 #ifdef BP_VENDOR_SUPPORT
-char *bp_desc_array[] =
-    { "e1000bp", "e1000bpe", "slcm5700", "bnx2xbp", "ixgbp", "ixgbpe", NULL };
+char *bp_desc_array[] = { "e1000bp", "e1000bpe", "slcm5700",
+                       "bnx2xbp", "ixgbp", "ixgbpe", NULL };
 #endif
 
 #endif