diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/stlc45xx/Kconfig | |
parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/stlc45xx/Kconfig')
-rw-r--r-- | drivers/staging/stlc45xx/Kconfig | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/stlc45xx/Kconfig b/drivers/staging/stlc45xx/Kconfig deleted file mode 100644 index 947fb75a9c68..000000000000 --- a/drivers/staging/stlc45xx/Kconfig +++ /dev/null @@ -1,8 +0,0 @@ -config STLC45XX - tristate "stlc4550/4560 support" - depends on MAC80211 && WLAN_80211 && SPI_MASTER && GENERIC_HARDIRQS - ---help--- - This is a driver for stlc4550 and stlc4560 chipsets. - - To compile this driver as a module, choose M here: the module will be - called stlc45xx. If unsure, say N. |