diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 10:44:50 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-16 10:44:50 -0800 |
| commit | 491acf0032c08a74a4c88032ca1c03b498bfec37 (patch) | |
| tree | b7194d3afb144fa007d0ca6a11c96297f36d42f8 /drivers/staging/wlan-ng/p80211netdev.c | |
| parent | 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b (diff) | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
| download | kernel_samsung_smdk4412-491acf0032c08a74a4c88032ca1c03b498bfec37.zip kernel_samsung_smdk4412-491acf0032c08a74a4c88032ca1c03b498bfec37.tar.gz kernel_samsung_smdk4412-491acf0032c08a74a4c88032ca1c03b498bfec37.tar.bz2 | |
Staging: Merge 2.6.37-rc2 into staging-next
This was necessary in order to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
drivers/staging/bcm/Bcmchar.c
drivers/staging/intel_sst/intel_sst_app_interface.c
All should be resolved now.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211netdev.c')
| -rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 48f223e..b0af292 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -523,8 +523,8 @@ static int p80211netdev_ethtool(wlandevice_t *wlandev, void __user *useraddr) if (copy_to_user(useraddr, &edata, sizeof(edata))) return -EFAULT; return 0; - } #endif + } return -EOPNOTSUPP; } |