060-no_local_ssb_bcma.patch 8.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335
  1. --- a/local-symbols
  2. +++ b/local-symbols
  3. @@ -395,43 +395,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_SERIAL=
  20. -SSB_DRIVER_PCICORE_POSSIBLE=
  21. -SSB_DRIVER_PCICORE=
  22. -SSB_PCICORE_HOSTMODE=
  23. -SSB_DRIVER_MIPS=
  24. -SSB_SFLASH=
  25. -SSB_EMBEDDED=
  26. -SSB_DRIVER_EXTIF=
  27. -SSB_DRIVER_GIGE=
  28. -SSB_DRIVER_GPIO=
  29. -BCMA_POSSIBLE=
  30. -BCMA=
  31. -BCMA_BLOCKIO=
  32. -BCMA_HOST_PCI_POSSIBLE=
  33. -BCMA_HOST_PCI=
  34. -BCMA_HOST_SOC=
  35. -BCMA_DRIVER_PCI=
  36. -BCMA_DRIVER_PCI_HOSTMODE=
  37. -BCMA_DRIVER_MIPS=
  38. -BCMA_PFLASH=
  39. -BCMA_SFLASH=
  40. -BCMA_NFLASH=
  41. -BCMA_DRIVER_GMAC_CMN=
  42. -BCMA_DRIVER_GPIO=
  43. -BCMA_DEBUG=
  44. USB_ACM=
  45. USB_PRINTER=
  46. USB_WDM=
  47. --- a/drivers/net/wireless/broadcom/b43/Kconfig
  48. +++ b/drivers/net/wireless/broadcom/b43/Kconfig
  49. @@ -61,21 +61,21 @@ endchoice
  50. config B43_PCI_AUTOSELECT
  51. bool
  52. depends on B43 && SSB_PCIHOST_POSSIBLE
  53. - select SSB_PCIHOST
  54. - select SSB_B43_PCI_BRIDGE
  55. + depends on SSB_PCIHOST
  56. + depends on SSB_B43_PCI_BRIDGE
  57. default y
  58. # Auto-select SSB PCICORE driver, if possible
  59. config B43_PCICORE_AUTOSELECT
  60. bool
  61. depends on B43 && SSB_DRIVER_PCICORE_POSSIBLE
  62. - select SSB_DRIVER_PCICORE
  63. + depends on SSB_DRIVER_PCICORE
  64. default y
  65. config B43_SDIO
  66. bool "Broadcom 43xx SDIO device support"
  67. depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE
  68. - select SSB_SDIOHOST
  69. + depends on SSB_SDIOHOST
  70. ---help---
  71. Broadcom 43xx device support for Soft-MAC SDIO devices.
  72. @@ -94,13 +94,13 @@ config B43_SDIO
  73. config B43_BCMA_PIO
  74. bool
  75. depends on B43 && B43_BCMA
  76. - select BCMA_BLOCKIO
  77. + depends on BCMA_BLOCKIO
  78. default y
  79. config B43_PIO
  80. bool
  81. depends on B43 && B43_SSB
  82. - select SSB_BLOCKIO
  83. + depends on SSB_BLOCKIO
  84. default y
  85. config B43_PHY_G
  86. --- a/drivers/net/wireless/broadcom/b43/main.c
  87. +++ b/drivers/net/wireless/broadcom/b43/main.c
  88. @@ -2876,7 +2876,7 @@ static struct ssb_device *b43_ssb_gpio_d
  89. {
  90. struct ssb_bus *bus = dev->dev->sdev->bus;
  91. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  92. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  93. return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
  94. #else
  95. return bus->chipco.dev;
  96. @@ -4893,7 +4893,7 @@ static int b43_wireless_core_init(struct
  97. }
  98. if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
  99. hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
  100. -#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
  101. +#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
  102. if (dev->dev->bus_type == B43_BUS_SSB &&
  103. dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
  104. dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
  105. --- a/drivers/net/wireless/broadcom/b43legacy/Kconfig
  106. +++ b/drivers/net/wireless/broadcom/b43legacy/Kconfig
  107. @@ -2,7 +2,7 @@ config B43LEGACY
  108. tristate "Broadcom 43xx-legacy wireless support (mac80211 stack)"
  109. depends on m
  110. depends on SSB_POSSIBLE && MAC80211 && HAS_DMA
  111. - select SSB
  112. + depends on SSB
  113. depends on FW_LOADER
  114. ---help---
  115. b43legacy is a driver for 802.11b devices from Broadcom (BCM4301 and
  116. @@ -24,15 +24,15 @@ config B43LEGACY
  117. config B43LEGACY_PCI_AUTOSELECT
  118. bool
  119. depends on B43LEGACY && SSB_PCIHOST_POSSIBLE
  120. - select SSB_PCIHOST
  121. - select SSB_B43_PCI_BRIDGE
  122. + depends on SSB_PCIHOST
  123. + depends on SSB_B43_PCI_BRIDGE
  124. default y
  125. # Auto-select SSB PCICORE driver, if possible
  126. config B43LEGACY_PCICORE_AUTOSELECT
  127. bool
  128. depends on B43LEGACY && SSB_DRIVER_PCICORE_POSSIBLE
  129. - select SSB_DRIVER_PCICORE
  130. + depends on SSB_DRIVER_PCICORE
  131. default y
  132. # LED support
  133. --- a/drivers/net/wireless/broadcom/b43legacy/main.c
  134. +++ b/drivers/net/wireless/broadcom/b43legacy/main.c
  135. @@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
  136. if (dev->dev->id.revision >= 2)
  137. mask |= 0x0010; /* FIXME: This is redundant. */
  138. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  139. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  140. pcidev = bus->pcicore.dev;
  141. #endif
  142. gpiodev = bus->chipco.dev ? : pcidev;
  143. @@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
  144. struct ssb_bus *bus = dev->dev->bus;
  145. struct ssb_device *gpiodev, *pcidev = NULL;
  146. -#ifdef CPTCFG_SSB_DRIVER_PCICORE
  147. +#ifdef CONFIG_SSB_DRIVER_PCICORE
  148. pcidev = bus->pcicore.dev;
  149. #endif
  150. gpiodev = bus->chipco.dev ? : pcidev;
  151. --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
  152. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/led.h
  153. @@ -22,7 +22,7 @@ struct brcms_led {
  154. bool active_low;
  155. };
  156. -#ifdef CPTCFG_BCMA_DRIVER_GPIO
  157. +#ifdef CONFIG_BCMA_DRIVER_GPIO
  158. void brcms_led_unregister(struct brcms_info *wl);
  159. int brcms_led_register(struct brcms_info *wl);
  160. #else
  161. --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
  162. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
  163. @@ -42,6 +42,6 @@ brcmsmac-y := \
  164. brcms_trace_events.o \
  165. debug.o
  166. -brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
  167. +brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
  168. obj-$(CPTCFG_BRCMSMAC) += brcmsmac.o
  169. --- a/drivers/net/wireless/broadcom/brcm80211/Kconfig
  170. +++ b/drivers/net/wireless/broadcom/brcm80211/Kconfig
  171. @@ -7,7 +7,7 @@ config BRCMSMAC
  172. depends on m
  173. depends on MAC80211
  174. depends on BCMA_POSSIBLE
  175. - select BCMA
  176. + depends on BCMA
  177. select NEW_LEDS if BCMA_DRIVER_GPIO
  178. select LEDS_CLASS if BCMA_DRIVER_GPIO
  179. select BRCMUTIL
  180. --- a/Kconfig.local
  181. +++ b/Kconfig.local
  182. @@ -1189,117 +1189,6 @@ config BACKPORTED_USB_VL600
  183. config BACKPORTED_USB_NET_CH9200
  184. tristate
  185. default USB_NET_CH9200
  186. -config BACKPORTED_SSB_POSSIBLE
  187. - tristate
  188. - default SSB_POSSIBLE
  189. -config BACKPORTED_SSB
  190. - tristate
  191. - default SSB
  192. -config BACKPORTED_SSB_SPROM
  193. - tristate
  194. - default SSB_SPROM
  195. -config BACKPORTED_SSB_BLOCKIO
  196. - tristate
  197. - default SSB_BLOCKIO
  198. -config BACKPORTED_SSB_PCIHOST_POSSIBLE
  199. - tristate
  200. - default SSB_PCIHOST_POSSIBLE
  201. -config BACKPORTED_SSB_PCIHOST
  202. - tristate
  203. - default SSB_PCIHOST
  204. -config BACKPORTED_SSB_B43_PCI_BRIDGE
  205. - tristate
  206. - default SSB_B43_PCI_BRIDGE
  207. -config BACKPORTED_SSB_PCMCIAHOST_POSSIBLE
  208. - tristate
  209. - default SSB_PCMCIAHOST_POSSIBLE
  210. -config BACKPORTED_SSB_PCMCIAHOST
  211. - tristate
  212. - default SSB_PCMCIAHOST
  213. -config BACKPORTED_SSB_SDIOHOST_POSSIBLE
  214. - tristate
  215. - default SSB_SDIOHOST_POSSIBLE
  216. -config BACKPORTED_SSB_SDIOHOST
  217. - tristate
  218. - default SSB_SDIOHOST
  219. -config BACKPORTED_SSB_HOST_SOC
  220. - tristate
  221. - default SSB_HOST_SOC
  222. -config BACKPORTED_SSB_SERIAL
  223. - tristate
  224. - default SSB_SERIAL
  225. -config BACKPORTED_SSB_DRIVER_PCICORE_POSSIBLE
  226. - tristate
  227. - default SSB_DRIVER_PCICORE_POSSIBLE
  228. -config BACKPORTED_SSB_DRIVER_PCICORE
  229. - tristate
  230. - default SSB_DRIVER_PCICORE
  231. -config BACKPORTED_SSB_PCICORE_HOSTMODE
  232. - tristate
  233. - default SSB_PCICORE_HOSTMODE
  234. -config BACKPORTED_SSB_DRIVER_MIPS
  235. - tristate
  236. - default SSB_DRIVER_MIPS
  237. -config BACKPORTED_SSB_SFLASH
  238. - tristate
  239. - default SSB_SFLASH
  240. -config BACKPORTED_SSB_EMBEDDED
  241. - tristate
  242. - default SSB_EMBEDDED
  243. -config BACKPORTED_SSB_DRIVER_EXTIF
  244. - tristate
  245. - default SSB_DRIVER_EXTIF
  246. -config BACKPORTED_SSB_DRIVER_GIGE
  247. - tristate
  248. - default SSB_DRIVER_GIGE
  249. -config BACKPORTED_SSB_DRIVER_GPIO
  250. - tristate
  251. - default SSB_DRIVER_GPIO
  252. -config BACKPORTED_BCMA_POSSIBLE
  253. - tristate
  254. - default BCMA_POSSIBLE
  255. -config BACKPORTED_BCMA
  256. - tristate
  257. - default BCMA
  258. -config BACKPORTED_BCMA_BLOCKIO
  259. - tristate
  260. - default BCMA_BLOCKIO
  261. -config BACKPORTED_BCMA_HOST_PCI_POSSIBLE
  262. - tristate
  263. - default BCMA_HOST_PCI_POSSIBLE
  264. -config BACKPORTED_BCMA_HOST_PCI
  265. - tristate
  266. - default BCMA_HOST_PCI
  267. -config BACKPORTED_BCMA_HOST_SOC
  268. - tristate
  269. - default BCMA_HOST_SOC
  270. -config BACKPORTED_BCMA_DRIVER_PCI
  271. - tristate
  272. - default BCMA_DRIVER_PCI
  273. -config BACKPORTED_BCMA_DRIVER_PCI_HOSTMODE
  274. - tristate
  275. - default BCMA_DRIVER_PCI_HOSTMODE
  276. -config BACKPORTED_BCMA_DRIVER_MIPS
  277. - tristate
  278. - default BCMA_DRIVER_MIPS
  279. -config BACKPORTED_BCMA_PFLASH
  280. - tristate
  281. - default BCMA_PFLASH
  282. -config BACKPORTED_BCMA_SFLASH
  283. - tristate
  284. - default BCMA_SFLASH
  285. -config BACKPORTED_BCMA_NFLASH
  286. - tristate
  287. - default BCMA_NFLASH
  288. -config BACKPORTED_BCMA_DRIVER_GMAC_CMN
  289. - tristate
  290. - default BCMA_DRIVER_GMAC_CMN
  291. -config BACKPORTED_BCMA_DRIVER_GPIO
  292. - tristate
  293. - default BCMA_DRIVER_GPIO
  294. -config BACKPORTED_BCMA_DEBUG
  295. - tristate
  296. - default BCMA_DEBUG
  297. config BACKPORTED_USB_ACM
  298. tristate
  299. default USB_ACM
  300. --- a/Kconfig.sources
  301. +++ b/Kconfig.sources
  302. @@ -7,9 +7,6 @@ source "$BACKPORT_DIR/net/mac80211/Kconf
  303. source "$BACKPORT_DIR/drivers/net/wireless/Kconfig"
  304. source "$BACKPORT_DIR/drivers/net/usb/Kconfig"
  305. -source "$BACKPORT_DIR/drivers/ssb/Kconfig"
  306. -source "$BACKPORT_DIR/drivers/bcma/Kconfig"
  307. -
  308. source "$BACKPORT_DIR/drivers/usb/class/Kconfig"
  309. source "$BACKPORT_DIR/drivers/staging/Kconfig"
  310. --- a/Makefile.kernel
  311. +++ b/Makefile.kernel
  312. @@ -40,8 +40,6 @@ obj-y += compat/
  313. obj-$(CPTCFG_CFG80211) += net/wireless/
  314. obj-$(CPTCFG_MAC80211) += net/mac80211/
  315. obj-$(CPTCFG_WLAN) += drivers/net/wireless/
  316. -obj-$(CPTCFG_SSB) += drivers/ssb/
  317. -obj-$(CPTCFG_BCMA) += drivers/bcma/
  318. obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
  319. obj-$(CPTCFG_USB_WDM) += drivers/usb/class/