summaryrefslogtreecommitdiff
path: root/drivers/staging
AgeCommit message (Collapse)Author
2009-11-16Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/comedi/drivers/ni_labpc_cs.c drivers/staging/comedi/drivers/ni_mio_cs.c
2009-11-16Merge branch 'quilt/driver-core'Stephen Rothwell
2009-11-16Merge remote branch 'sysctl/master'Stephen Rothwell
2009-11-16Merge remote branch 'trivial/for-next'Stephen Rothwell
2009-11-16Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/wireless/ray_cs.c drivers/pcmcia/Makefile
2009-11-16Merge branch 'quilt/rr'Stephen Rothwell
2009-11-16Merge remote branch 'wireless/master'Stephen Rothwell
2009-11-16Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig
2009-11-16Merge remote branch 'kbuild/master'Stephen Rothwell
2009-11-16Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/common/tuners/tda18271-fe.c
2009-11-14Staging: octeon-ethernet: Convert to use PHY Abstraction Layer.David Daney
The octeon-ethernet driver shares an mdio bus with the octeon-mgmt driver. Here we convert the octeon-ethernet driver to use the PHY Abstraction Layer. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-11-14Staging: octeon-ethernet: Assign proper MAC addresses.David Daney
Allocate MAC addresses using the same method as the bootloader. This avoids changing the MAC between bootloader and kernel operation as well as avoiding duplicates and use of addresses outside of the assigned range. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-11-14Staging: Octeon: Use symbolic values for irq numbers.David Daney
In addition to being magic numbers, the irq number passed to free_irq is incorrect. We need to use the correct symbolic value instead. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-11-14MIPS: Octeon: Fix compile error in drivers/staging/octeon/ethernet-mdio.cDavid Daney
Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-11-13param:remove-useless-writable-charpRusty Russell
sysfs-writable charp arguments need to be locked against modification (since the old ones may be kfreed underneath us). String arguments are much simpler, so use them for small strings (eg. IFNAMSIZ). lkdtm only uses the parameters at module initialization time, so there's not much point making them writable. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Reviewed-by: Takashi Iwai <tiwai@suse.de>
2009-11-11staging/wireless: don't build when NET etc. are not enabledRandy Dunlap
These wireless drivers in staging could be built when CONFIG_NET=n, CONFIG_NETDEVICES=n, causing this build error: net/wireless/wext-priv.c: In function 'ioctl_private_call': net/wireless/wext-priv.c:206: error: implicit declaration of function 'call_commit_handler' due to faulty selects. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-11-11tree-wide: fix some typos and punctuation in commentsThadeu Lima de Souza Cascardo
fix some typos and punctuation in comments Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-09Merge branch 'master' of ↵David S. Miller
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2009-11-09pcmcia/staging: update comedi driversDominik Brodowski
Update comedi PCMCIA drivers to work with recent PCMCIA changes documented in Documentation/pcmcia/driver-changes.txt: - use pcmcia_config_loop() - don't use PCMCIA_DEBUG, but use dev_dbg() - don't use cs_error() - re-use prod_id and card_id values already stored Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
2009-11-09Staging: rtl8192u: remove dead codeMauro Carvalho Chehab
Remove #ifse against older kernel versions; Remove codes marked with #if 0; Remove #if 1 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: rtl8192u: remove bad whitespacesMauro Carvalho Chehab
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: rtl8192u: make it compileMauro Carvalho Chehab
Add it to staging Kbuild and fixes some API differences that prevents compilation. It seems that the ieee80211 stack is very close to rtl8192su one. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: Added Realtek rtl8192u driver to stagingMauro Carvalho Chehab
Add Realtek linux driver for rtl8192u as provided by Realtek rtl8192u_linux_2.6.0006.1031.2008.tar.gz, send to me C/C staging ML. This version won't compile against upstream, doesn't follow Linux CodingStyle and has their own ieee80211 stack. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: dream: remove driversGreg Kroah-Hartman
The dream drivers do not build at all, and currently require arch-specific include files tweaks and external patches in order to work properly. So, let's delete the files for now, they can come back later when they can be properly built within the drivers/staging/ directory. Also a TODO file will be needed for them, somehow that got forgotten this time around as well. Cc: Pavel Machek <pavel@ucw.cz> Cc: Arve Hjønnevåg <arve@android.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: android: delete android driversGreg Kroah-Hartman
These drivers are no longer being developed and the original authors seem to have abandonded them and hence, do not want them in the mainline kernel tree. So sad :( Cc: Brian Swetland <swetland@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: RTL8192SU depends on USBRandy Dunlap
USB device driver needs to depend on USB to prevent build errors: ERROR: "usb_kill_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_deregister" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_control_msg" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_register_driver" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/rtl8192su/r8192s_usb.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: dst: Fix parenthesesRoel Kluin
`|' has a higher precedence than `?' so since MSG_WAITALL is defined 0x100, MSG_MORE was always written to the msg_flag. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09staging: vme: Fix mutex lockingMartyn Welch
Fix incorrect use of mutex_trylock(). Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: Rename VME DMA functionsMartyn Welch
The DMA resource allocation function is called "vme_request_dma" while master and slave window allocation functions are called "vme_master_request" and "vme_slave_request" respectively. Rename "vme_request_dma" to "vme_dma_request" to fit the pattern. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: Clean up tsi148 driverMartyn Welch
* Remove message from IACK interrupt handler * Correct clearing of location monitor interrupts * Remove interrupt cleanup code that's duplcated in sub function Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: Correct operation of vme_lm_freeMartyn Welch
The vme_lm_free() function is not clearing up the resource created in vme_lm_request(). In addition vme_lm_free() is void function and is used in exit/error paths, we should wait for mutex to become free rather than exiting and not freeing the resource. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: Allow size of 0 when disabling a windowMartyn Welch
The TSI148 driver currently does not allow a size of zero to be passed to a window. Zero is a valid value if the window is being disabled. Allow windows to be disabled and their registers cleared. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: fix compiler warnings in vme_ca91cx42.cGreg Kroah-Hartman
It's causing people to ignore problems in the file, so get rid of them so it's obvious something is wrong in the future. Cc: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: Pull common VME interrupt handling into core codeMartyn Welch
Currently the VME callback infrastructure is replicated in each VME driver. Move this common code into the VME core. Rename functions to fit in better with naming of other VME functions. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09staging: vme: correct array overflowMartyn Welch
Eric Sesterhenn noticed that vme_user is overflowing an array used by sprintf. Use a bigger array. CC: Eric Sesterhenn <eric.sesterhenn@lsexperts.de> Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vme: remove unused #include <linux/version.h>Huang Weiyi
Remove unused #include <linux/version.h>('s) in drivers/staging/vme/bridges/vme_ca91cx42.c drivers/staging/vme/bridges/vme_tsi148.c drivers/staging/vme/devices/vme_user.c drivers/staging/vme/vme.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Acked-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6655: remove __cplusplus ifdefsShawn Bohrer
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6656 remove unneeded version.h and version checkShawn Bohrer
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6655 remove unneeded version.hShawn Bohrer
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6656 remove duplicate includesShawn Bohrer
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6655 remove duplicate includesShawn Bohrer
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6656 remove kcompat.hShawn Bohrer
The vt6656 driver is integrated in the kernel so it no longer needs the compatibility header. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6655 remove kcompat.hShawn Bohrer
The vt6655 driver is integrated in the kernel so it no longer needs the compatibility header. Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6655: Correct unsigned bound issueRoel Kluin
uNodeIndex is unsigned, check whether it is within bounds instead. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: vt6656: use lowercase for VIA USB vendor idOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: octeon: don't ignore request_irq() return codeRoel Kluin
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: netwave: add TODO fileGreg Kroah-Hartman
Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: wavelan: add TODO fileGreg Kroah-Hartman
Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: arlan: add TODO fileGreg Kroah-Hartman
Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-11-09Staging: strip: add TODO fileGreg Kroah-Hartman
Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>