]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 06:26:34 +0000 (23:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Jul 2011 06:26:34 +0000 (23:26 -0700)
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - 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

23 files changed:
1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
drivers/staging/bcm/headers.h
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
drivers/staging/gma500/psb_intel_display.c
drivers/staging/hv/hv_mouse.c
drivers/staging/lirc/lirc_zilog.c
drivers/staging/rtl8187se/ieee80211/ieee80211.h
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192e/ieee80211/ieee80211.h
drivers/staging/rtl8192e/ieee80211/ieee80211_module.c
drivers/staging/rtl8192e/r8192E.h
drivers/staging/rtl8192e/r8192E_core.c
drivers/staging/rtl8192u/ieee80211/ieee80211.h
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
drivers/staging/rtl8192u/r8192U_core.c
drivers/staging/rtl8712/osdep_service.h
drivers/staging/sep/sep_driver.c
drivers/staging/wlags49_h2/wl_internal.h
drivers/usb/storage/Kconfig

diff --cc MAINTAINERS
Simple merge
index 8fe8d2b1f6277382cbc40b1289c466ed08208081,ab0a1db2bb3836e556e733b6a15479a77eba8980..947d063256818aa92ef67d8e3b71df625ed5ed22
  #include <linux/wait.h>
  #include <linux/proc_fs.h>
  #include <linux/interrupt.h>
- #include <linux/version.h>
 -
  #include <linux/stddef.h>
 -#include <linux/kernel.h>
  #include <linux/stat.h>
  #include <linux/fcntl.h>
  #include <linux/unistd.h>
index 09957bd6b79cced7716c9954fdfe56d3c37b622e,6c8599c972add41905ab1f08c56845315e9d724f..05dada98eb6bfb6bbacc0a6d8c5cf41834d39ffd
  #include <linux/fcntl.h>
  #include <linux/fs.h>
  #include <linux/uaccess.h>
- #include <bcmdefs.h>
- #include <bcmutils.h>
- #include <dngl_stats.h>
- #include <dhd.h>
- #include <dhd_bus.h>
- #include <dhd_proto.h>
- #include <dhd_dbg.h>
- #include <wl_cfg80211.h>
- #define EPI_VERSION_STR               "4.218.248.5"
- #define ETH_P_BRCM                    0x886c
- #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
- #include <linux/wifi_tiwlan.h>
- struct semaphore wifi_control_sem;
- struct dhd_bus *g_bus;
- static struct wifi_platform_data *wifi_control_data;
- static struct resource *wifi_irqres;
- int wifi_get_irq_number(unsigned long *irq_flags_ptr)
- {
-       if (wifi_irqres) {
-               *irq_flags_ptr = wifi_irqres->flags & IRQF_TRIGGER_MASK;
-               return (int)wifi_irqres->start;
-       }
- #ifdef CUSTOM_OOB_GPIO_NUM
-       return CUSTOM_OOB_GPIO_NUM;
- #else
-       return -1;
- #endif
- }
- int wifi_set_carddetect(int on)
- {
-       printk(KERN_ERR "%s = %d\n", __func__, on);
-       if (wifi_control_data && wifi_control_data->set_carddetect)
-               wifi_control_data->set_carddetect(on);
-       return 0;
- }
- int wifi_set_power(int on, unsigned long msec)
- {
-       printk(KERN_ERR "%s = %d\n", __func__, on);
-       if (wifi_control_data && wifi_control_data->set_power)
-               wifi_control_data->set_power(on);
-       if (msec)
-               mdelay(msec);
-       return 0;
- }
- int wifi_set_reset(int on, unsigned long msec)
- {
-       printk(KERN_ERR "%s = %d\n", __func__, on);
-       if (wifi_control_data && wifi_control_data->set_reset)
-               wifi_control_data->set_reset(on);
-       if (msec)
-               mdelay(msec);
-       return 0;
- }
- static int wifi_probe(struct platform_device *pdev)
- {
-       struct wifi_platform_data *wifi_ctrl =
-           (struct wifi_platform_data *)(pdev->dev.platform_data);
-       printk(KERN_ERR "## %s\n", __func__);
-       wifi_irqres =
-           platform_get_resource_byname(pdev, IORESOURCE_IRQ,
-                                        "bcm4329_wlan_irq");
-       wifi_control_data = wifi_ctrl;
-       wifi_set_power(1, 0);   /* Power On */
-       wifi_set_carddetect(1); /* CardDetect (0->1) */
-       up(&wifi_control_sem);
-       return 0;
- }
- static int wifi_remove(struct platform_device *pdev)
- {
-       struct wifi_platform_data *wifi_ctrl =
-           (struct wifi_platform_data *)(pdev->dev.platform_data);
-       printk(KERN_ERR "## %s\n", __func__);
-       wifi_control_data = wifi_ctrl;
-       wifi_set_carddetect(0); /* CardDetect (1->0) */
-       wifi_set_power(0, 0);   /* Power Off */
-       up(&wifi_control_sem);
-       return 0;
- }
- static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       DHD_TRACE(("##> %s\n", __func__));
-       return 0;
- }
- static int wifi_resume(struct platform_device *pdev)
- {
-       DHD_TRACE(("##> %s\n", __func__));
-       return 0;
- }
- static struct platform_driver wifi_device = {
-       .probe = wifi_probe,
-       .remove = wifi_remove,
-       .suspend = wifi_suspend,
-       .resume = wifi_resume,
-       .driver = {
-                  .name = KBUILD_MODNAME,
-                  }
- };
- int wifi_add_dev(void)
- {
-       DHD_TRACE(("## Calling platform_driver_register\n"));
-       return platform_driver_register(&wifi_device);
- }
- void wifi_del_dev(void)
- {
-       DHD_TRACE(("## Unregister platform_driver_register\n"));
-       platform_driver_unregister(&wifi_device);
- }
- #endif        /* defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC) */
 +#include <linux/interrupt.h>
 +#include <linux/hardirq.h>
+ #include <net/cfg80211.h>
+ #include <defs.h>
+ #include <brcmu_utils.h>
+ #include <brcmu_wifi.h>
+ #include "dhd.h"
+ #include "dhd_bus.h"
+ #include "dhd_proto.h"
+ #include "dhd_dbg.h"
+ #include "wl_cfg80211.h"
+ #include "bcmchip.h"
  
  #if defined(CONFIG_PM_SLEEP)
  #include <linux/suspend.h>
index 82612290b99bfcbab089ba2dfc294afd97303f5c,84245b9a23e7d99589882813527b4e0471b2b5be..d6de44e430d32d5f86539692225856252b4691b3
  #include <linux/pci.h>
  #include <linux/sched.h>
  #include <linux/firmware.h>
 +#include <linux/interrupt.h>
  #include <net/mac80211.h>
- #include <proto/802.11.h>
- #include <bcmdefs.h>
- #include <bcmwifi.h>
- #include <bcmutils.h>
- #include <bcmnvram.h>
- #include <pcicfg.h>
- #include <wlioctl.h>
- #include <sbhnddma.h>
- #include "phy/wlc_phy_int.h"
+ #include <defs.h>
+ #include "nicpci.h"
+ #include "phy/phy_int.h"
  #include "d11.h"
- #include "wlc_types.h"
- #include "wlc_cfg.h"
- #include "phy/phy_version.h"
- #include "wlc_key.h"
- #include "wlc_channel.h"
- #include "wlc_scb.h"
- #include "wlc_pub.h"
- #include "wl_dbg.h"
- #include "wl_export.h"
- #include "wl_ucode.h"
- #include "wl_mac80211.h"
+ #include "channel.h"
+ #include "scb.h"
+ #include "pub.h"
+ #include "ucode_loader.h"
+ #include "mac80211_if.h"
  
  #define N_TX_QUEUES   4 /* #tx queues on mac80211<->driver interface */
  
index f7a58b7a550a1fdc3af5d0efaaeb741e53fd395b,40e3d375ea993bb87d7cfea73ce1cb4cf1b987e1..5711e7c16b5043693a6177b12fec1a200b93191b
   * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
- #ifndef _wl_mac80211_h_
- #define _wl_mac80211_h_
+ #ifndef _BRCM_MAC80211_IF_H_
+ #define _BRCM_MAC80211_IF_H_
+ #include <linux/timer.h>
+ #include <linux/interrupt.h>
+ /* softmac ioctl definitions */
+ #define BRCMS_SET_SHORTSLOT_OVERRIDE          146
  
 +#include <linux/interrupt.h>
 +
  /* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and
   * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
   * submitted to workqueue instead of being on kernel timer
Simple merge
Simple merge
index 00ee02f841adcec71bb0b5364f1b408af3324a52,52a7386d20745643c57a85d955024cfbe9d49ca4..38e67f0bf6246381ff29d2c569c925a6c028de46
@@@ -19,8 -19,6 +19,7 @@@
  #include <linux/random.h>
  #include <linux/delay.h>
  #include <linux/slab.h>
- #include <linux/version.h>
 +#include <linux/interrupt.h>
  #include <asm/uaccess.h>
  
  #include "dot11d.h"
index 89fe8fc3d6c24ea548050602dfa722f826492757,0faa63777fcabf087959260198de224ecccf4fc0..137f66b034bb92586e664074eb14cabe630a6c7b
@@@ -35,8 -35,6 +35,7 @@@
  #include <linux/proc_fs.h>    // Necessary because we use the proc fs
  #include <linux/if_arp.h>
  #include <linux/random.h>
- #include <linux/version.h>
 +#include <linux/interrupt.h>
  #include <asm/io.h>
  #include "ieee80211/rtl819x_HT.h"
  #include "ieee80211/ieee80211.h"
Simple merge
Simple merge