1
0

060-no_local_ssb_bcma.patch 3.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132
  1. --- a/.local-symbols
  2. +++ b/.local-symbols
  3. @@ -482,45 +482,6 @@ USB_IPHETH=
  4. USB_SIERRA_NET=
  5. USB_VL600=
  6. USB_NET_CH9200=
  7. -SSB_POSSIBLE=
  8. -SSB=
  9. -SSB_SPROM=
  10. -SSB_BLOCKIO=
  11. -SSB_PCIHOST_POSSIBLE=
  12. -SSB_PCIHOST=
  13. -SSB_B43_PCI_BRIDGE=
  14. -SSB_PCMCIAHOST_POSSIBLE=
  15. -SSB_PCMCIAHOST=
  16. -SSB_SDIOHOST_POSSIBLE=
  17. -SSB_SDIOHOST=
  18. -SSB_HOST_SOC=
  19. -SSB_SILENT=
  20. -SSB_DEBUG=
  21. -SSB_SERIAL=
  22. -SSB_DRIVER_PCICORE_POSSIBLE=
  23. -SSB_DRIVER_PCICORE=
  24. -SSB_PCICORE_HOSTMODE=
  25. -SSB_DRIVER_MIPS=
  26. -SSB_SFLASH=
  27. -SSB_EMBEDDED=
  28. -SSB_DRIVER_EXTIF=
  29. -SSB_DRIVER_GIGE=
  30. -SSB_DRIVER_GPIO=
  31. -BCMA_POSSIBLE=
  32. -BCMA=
  33. -BCMA_BLOCKIO=
  34. -BCMA_HOST_PCI_POSSIBLE=
  35. -BCMA_HOST_PCI=
  36. -BCMA_HOST_SOC=
  37. -BCMA_DRIVER_PCI=
  38. -BCMA_DRIVER_PCI_HOSTMODE=
  39. -BCMA_DRIVER_MIPS=
  40. -BCMA_PFLASH=
  41. -BCMA_SFLASH=
  42. -BCMA_NFLASH=
  43. -BCMA_DRIVER_GMAC_CMN=
  44. -BCMA_DRIVER_GPIO=
  45. -BCMA_DEBUG=
  46. NFC=
  47. NFC_DIGITAL=
  48. NFC_NCI=
  49. --- a/drivers/net/wireless/broadcom/b43/main.c
  50. +++ b/drivers/net/wireless/broadcom/b43/main.c
  51. @@ -2866,7 +2866,7 @@ static struct ssb_device *b43_ssb_gpio_d
  52. {
  53. struct ssb_bus *bus = dev->dev->sdev->bus;
  54. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  55. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  56. return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
  57. #else
  58. return bus->chipco.dev;
  59. @@ -4883,7 +4883,7 @@ static int b43_wireless_core_init(struct
  60. }
  61. if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
  62. hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
  63. -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
  64. +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
  65. if (dev->dev->bus_type == B43_BUS_SSB &&
  66. dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
  67. dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
  68. --- a/drivers/net/wireless/broadcom/b43legacy/main.c
  69. +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
  70. @@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
  71. if (dev->dev->id.revision >= 2)
  72. mask |= 0x0010; /* FIXME: This is redundant. */
  73. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  74. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  75. pcidev = bus->pcicore.dev;
  76. #endif
  77. gpiodev = bus->chipco.dev ? : pcidev;
  78. @@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
  79. struct ssb_bus *bus = dev->dev->bus;
  80. struct ssb_device *gpiodev, *pcidev = NULL;
  81. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  82. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  83. pcidev = bus->pcicore.dev;
  84. #endif
  85. gpiodev = bus->chipco.dev ? : pcidev;
  86. --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
  87. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
  88. @@ -42,6 +42,6 @@ brcmsmac-y := \
  89. brcms_trace_events.o \
  90. debug.o
  91. -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
  92. +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
  93. obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
  94. --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
  95. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
  96. @@ -22,7 +22,7 @@ struct brcms_led {
  97. bool active_low;
  98. };
  99. -#ifdef CPTCFG_BCMA_DRIVER_GPIO
  100. +#ifdef CONFIG_BCMA_DRIVER_GPIO
  101. void brcms_led_unregister(struct brcms_info *wl);
  102. int brcms_led_register(struct brcms_info *wl);
  103. #else
  104. --- a/Kconfig.sources
  105. +++ b/Kconfig.sources
  106. @@ -9,9 +9,6 @@ source "$BACKPORT_DIR/drivers/net/wirele
  107. source "$BACKPORT_DIR/drivers/net/ethernet/Kconfig"
  108. source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
  109. -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
  110. -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
  111. -
  112. source "$BACKPORT_DIR/net/nfc/Kconfig"
  113. source "$BACKPORT_DIR/drivers/media/Kconfig"
  114. --- a/Makefile.kernel
  115. +++ b/Makefile.kernel
  116. @@ -38,8 +38,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
  117. obj-$(CPTCFG_WLAN) += drivers/net/wireless/
  118. obj-$(CPTCFG_BT) += net/bluetooth/
  119. obj-$(CPTCFG_BT) += drivers/bluetooth/
  120. -obj-$(CPTCFG_SSB) += drivers/ssb/
  121. -obj-$(CPTCFG_BCMA) += drivers/bcma/
  122. obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
  123. obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
  124. obj-$(CPTCFG_NFC) += net/nfc/