staging: brcm80211: merged sbsdio.h into sdio_host.h
authorRoland Vossen <rvossen@broadcom.com>
Tue, 5 Jul 2011 22:02:49 +0000 (00:02 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 6 Jul 2011 02:47:50 +0000 (19:47 -0700)
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/sbsdio.h [deleted file]
drivers/staging/brcm80211/brcmfmac/sdio_host.h

diff --cc drivers/staging/brcm80211/brcmfmac/sbsdio.h
Simple merge