diff options
| author | Larry Finger | 2011-07-26 22:52:24 +0200 |
|---|---|---|
| committer | Larry Finger | 2011-07-26 22:52:24 +0200 |
| commit | 48d67fe03511c8ded54c39561dfedbdf7c78c743 (patch) | |
| tree | e8aa39f29bda0fa6b39fd7271b2e172b89d8031a /drivers/staging/rtl8192e/ieee80211 | |
| parent | staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register. (diff) | |
| parent | Merge 'akpm' patch series (diff) | |
| download | kernel-qcow2-linux-48d67fe03511c8ded54c39561dfedbdf7c78c743.tar.gz kernel-qcow2-linux-48d67fe03511c8ded54c39561dfedbdf7c78c743.tar.xz kernel-qcow2-linux-48d67fe03511c8ded54c39561dfedbdf7c78c743.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/staging/bcm/headers.h
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/et131x/et131x_netdev.c
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192e/r8192E.h
drivers/staging/usbip/userspace/src/utils.h
Diffstat (limited to 'drivers/staging/rtl8192e/ieee80211')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211_module.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index a58519e9ada1..6d7963e5b6ae 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h @@ -30,6 +30,7 @@ #include <linux/timer.h> #include <linux/sched.h> #include <linux/semaphore.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/wireless.h> diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c index c1c294ec80df..37a65ff4b12c 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c @@ -310,7 +310,7 @@ int __init ieee80211_rtl_init(void) } ieee80211_debug_level = debug; - ieee80211_proc = create_proc_entry(DRV_NAME, S_IFDIR, init_net.proc_net); + ieee80211_proc = proc_mkdir(DRV_NAME, init_net.proc_net); if (ieee80211_proc == NULL) { IEEE80211_ERROR("Unable to create " DRV_NAME " proc directory\n"); |