From 75e07b6b2bcb1dad971870a039d5f1441e64bd58 Mon Sep 17 00:00:00 2001
From: Henry Ptasinski <henryp@broadcom.com>
Date: Tue, 23 Aug 2011 14:13:53 +0200
Subject: [PATCH] staging: brcm80211: only enable brcmsmac if bcma is not set

brcmsmac doesn't yet use bcma, but both drivers attempt to claim the same
device.  For now, turn of brcmsmac if bcma is enabled.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
Reading git-format-patch failed