diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2014-05-18 12:55:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-18 10:03:31 -0700 |
commit | bb7e5ed497f8fdf399d582f0fd4af4ef7d752d77 (patch) | |
tree | e21703cc17a3b887075d246d850e022c082838d3 | |
parent | 9cade5aceb9c78b96260f78249cadc579ab4118c (diff) |
staging: xgifb: Eliminate useless ifndefs
XGI_VB_CHIP_TYPE, PCI_DEVICE_ID_XGI_42 and PCI_DEVICE_ID_XGI_27
are never defined.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 4 | ||||
-rw-r--r-- | drivers/staging/xgifb/vgatypes.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 95ce9708cec..85079fea715 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h @@ -4,12 +4,8 @@ #include "XGIfb.h" #include "vb_def.h" -#ifndef PCI_DEVICE_ID_XGI_42 #define PCI_DEVICE_ID_XGI_42 0x042 -#endif -#ifndef PCI_DEVICE_ID_XGI_27 #define PCI_DEVICE_ID_XGI_27 0x027 -#endif static const struct pci_device_id xgifb_pci_table[] = { {PCI_DEVICE(PCI_VENDOR_ID_XGI, PCI_DEVICE_ID_XGI_20)}, diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h index 264351441f9..61fa10fd470 100644 --- a/drivers/staging/xgifb/vgatypes.h +++ b/drivers/staging/xgifb/vgatypes.h @@ -5,7 +5,6 @@ #include "../../video/fbdev/sis/vgatypes.h" #include "../../video/fbdev/sis/sis.h" /* for LCD_TYPE */ -#ifndef XGI_VB_CHIP_TYPE enum XGI_VB_CHIP_TYPE { VB_CHIP_Legacy = 0, VB_CHIP_301, @@ -19,7 +18,6 @@ enum XGI_VB_CHIP_TYPE { VB_CHIP_UNKNOWN, /* other video bridge or no video bridge */ MAX_VB_CHIP }; -#endif struct xgi_hw_device_info { unsigned long ulExternalChip; /* NO VB or other video bridge*/ |