ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.
Before this patch CONFIG_SSB_BLOCKIO was set to y in compat-wireless but the in kernel ssb system had it set to n, this causes an invalid pointer. b43 now needs CONFIG_SSB_BLOCKIO=y SVN-Revision: 21449
This commit is contained in:
@@ -2167,7 +2167,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
||||
@@ -2174,7 +2174,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
||||
@@ -2289,7 +2289,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
||||
@@ -2317,7 +2317,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
||||
@@ -2373,7 +2373,6 @@ CONFIG_SQUASHFS_LZMA=y
|
||||
CONFIG_SQUASHFS_SUPPORT_ZLIB=y
|
||||
# CONFIG_SQUASHFS_VMALLOC is not set
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SSB_BLOCKIO is not set
|
||||
# CONFIG_SSB_DEBUG is not set
|
||||
# CONFIG_SSB is not set
|
||||
# CONFIG_SSB_PCMCIAHOST is not set
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
||||
@@ -1,6 +1,14 @@
|
||||
--- a/drivers/ssb/Kconfig
|
||||
+++ b/drivers/ssb/Kconfig
|
||||
@@ -49,7 +49,7 @@ config SSB_PCIHOST
|
||||
@@ -29,6 +29,7 @@ config SSB_SPROM
|
||||
config SSB_BLOCKIO
|
||||
bool
|
||||
depends on SSB
|
||||
+ default y
|
||||
|
||||
config SSB_PCIHOST_POSSIBLE
|
||||
bool
|
||||
@@ -49,7 +50,7 @@ config SSB_PCIHOST
|
||||
config SSB_B43_PCI_BRIDGE
|
||||
bool
|
||||
depends on SSB_PCIHOST
|
||||
|
||||
Reference in New Issue
Block a user