summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-04-09Merge commit 'x86/for-akpm'Stephen Rothwell
2008-04-09Merge branch 'quilt/usb'Stephen Rothwell
2008-04-09Merge branch 'quilt/pci'Stephen Rothwell
2008-04-09Merge branch 'quilt/driver-core'Stephen Rothwell
2008-04-09Merge commit 'sched-fixes/for-linus'Stephen Rothwell
2008-04-09wusb: add the wireless usb stack to LinuxGreg Kroah-Hartman
TODO: - minor cleanups - sysfs usage isn't "optimal" - remove build #warnings - clean up the #ifdefs for kernel versions Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09wusb-update-devnumDavid Vrabel
usb: don't update devnum for wusb devices For WUSB devices, usb_dev.devnum is a device index and not the real device address (which is managed by wusbcore). Therefore, only set devnum once (in choose_address()) and never change it. Signed-off-by: David Vrabel <david.vrabel@csr.com>
2008-04-09lib-bitmap_copy_leDavid Vrabel
[PATCH] bitmap: add bitmap_copy_le() bitmap_copy_le() copies a bitmap, putting the bits into little-endian order (i.e., each unsigned long word in the bitmap is put into little-endian order). The UWB stack used bitmaps to manage Medium Access Slot availability, and these bitmaps need to be written to the hardware in LE order. Signed-off-by: David Vrabel <david.vrabel@csr.com>
2008-04-09wusb-make-ep0-reinit-availableInaky Perez-Gonzalez
wusb: make ep0_reinit available for modules We need to be able to call ep0_reinit() [renamed to usb_ep0_reinit()] from the WUSB security code. The reason is that when we authenticate the device, it's address changes (from having bit 7 set to having it cleared). Thus, we need to signal the USB stack to reinitialize EP0, so the status with the previous address kept at the HCD layer is cleared and properly reinitialized. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
2008-04-09wusb-devices-dont-use-a-set-addressInaky Perez-Gonzalez
wusb: devices dont use a set address A WUSB device gets his address during the connection phase; later on, during the authenthication phase (driven from user space) we assign the final address. So we need to skip in hub_port_init() the actual setting of the address for WUSB devices. Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
2008-04-09wusb-teach-choose-address-about-wireless-devicesInaky Perez-Gonzalez
wusb: teach choose_address() about wireless devices Modify choose_address() so it knows about our special scheme of addressing WUSB devices (1:1 w/ port number). Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
2008-04-09NET: add et131x driverGreg Kroah-Hartman
This is a driver for the ET1310 network device. Based on the driver found at https://sourceforge.net/projects/et131x/ Cleaned up immensely by Olaf Hartman <o.hartmann@telovital.com> and Christoph Hellwig <hch@infradead.org> Note, the powermanagement options were removed from the vendor provided driver as they did not build properly at the time. TODO: - kernel coding style cleanups - forward port for latest network driver changes - kill useless typecasts (e.g. in et1310_phy.c) - alloc_etherdev is initializing memory with zero?!? - add_timer call in et131x_netdev.c is correct? - Add power saving functionality (suspend, sleep, resume) - Implement a few more kernel Parameter (set mac ) Cc: Olaf Hartmann <o.hartmann@telovital.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Dean Adams <dadams1969@gmail.com> Cc: Victor Soriano <vjsoriano@agere.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09aectc: add the aectc driverBrandon Philips
TODO: - provide a description of what this driver is - make it work properly :) Signed-off-by: Brandon Philips <brandon@ifup.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09novfs: Add the Novell filesystem client kernel moduleGreg Kroah-Hartman
This adds the Novell filesystem client kernel module. Things to do before it can be submitted: - coding style cleanups - remove typedefs - function name lowercase - 80 chars wide - sparse cleanups - __user markings - endian markings - remove functions that are never called and structures never used - yeah, there are a lot of them... - remove wrapper functions - private kmalloc/free? - resolve FIXME markings that have been added to the code - wrong types passed to functions!!! - userspace interface revisit - uses /proc/novfs, not nice. - might need userspace tools rework Cc: Lonnie Iverson <ldiverson@novell.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09add me4000 pci data collection driverGreg Kroah-Hartman
Originally written by Guenter Gebhardt <g.gebhardt@meilhaus.de> Lots of work are needed to get this into merging shape... Cc: Wolfgang Beiter <w.beiter@aon.at> Cc: Guenter Gebhardt <g.gebhardt@meilhaus.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09Input: add appleir driverGreg Kroah-Hartman
This driver was originally written by James McKenzie but forward ported and cleaned up by me to get it to work with modern kernel versions. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09NET: add Alacritech slicoss driverGreg Kroah-Hartman
This adds the Alacritech slicoss driver to the tree. This driver is supposed to support: Mojave cards (single port PCI Gigabit) both copper and fiber Oasis cards (single and dual port PCI-x Gigabit) copper and fiber Kalahari cards (dual and quad port PCI-e Gigabit) copper and fiber The driver was acutally tested on Oasis and Kalahari cards. Cc: Christopher Harrer <charrer@alacritech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09Video: add the go7007 driverGreg Kroah-Hartman
Doesn't build yet, but we have to start somewhere...
2008-04-09DVB: add firesat driverGreg Kroah-Hartman
Original code written by Christian Dolzer <c.dolzer@digital-everywhere.com> Cleaned up by Greg. Cc: Christian Dolzer <c.dolzer@digital-everywhere.com> Cc: Andreas Monitzer <andy@monitzer.com> Cc: Manu Abraham <manu@linuxtv.org> Cc: Fabio De Lorenzo <delorenzo.fabio@gmail.com> Cc: Robert Berger <robert.berger@reliableembeddedsystems.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09USB: add Sensoray 2255 v4l driverGreg Kroah-Hartman
This driver is still very rough, but included here while it is being worked on so I catch any api changes and it will show up in linux-next and -mm for people to start using. It will not end up in the drivers/usb/image/ directory, it's just there for me to be able to play with it easier for now. Cc: Dean Anderson <dean@sensoray.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2008-04-09m68k: Make gcc aware that BUG() does not returnGeert Uytterhoeven
Use `__builtin_trap()' instead of `asm volatile("illegal")' in the m68k BUG() macros (as suggested by Andrew Pinski), to kill warnings in code that assumes BUG() does not return. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k vme_scc: avoid global namespace pollutionGeert Uytterhoeven
m68k vme_scc: - make scc_ports[] static - kill unused global scc_initialized Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k: Kill CONFIG_WHIPPET_SERIALGeert Uytterhoeven
The Hisoft Whippet PCMCIA serial driver has been removed a long time ago, but it's Kconfig symbol still existed. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k: FB_HP300 does not need FB_CFB_FILLRECTGeert Uytterhoeven
FB_HP300 does not need FB_CFB_FILLRECT Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k: Convert access_ok() to an inline functionGeert Uytterhoeven
Convert access_ok() from a macro to an inline function, so the compiler no longer complains about unused variables: fs/read_write.c: In function 'rw_copy_check_uvector': fs/read_write.c:556: warning: unused variable 'buf' Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k: update defconfigs for 2.6.25-rc8Geert Uytterhoeven
Long overdue update of the m68k defconfigs Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09m68k: use KBUILD_DEFCONFIGAdrian Bunk
The default defconfig should be one from arch/m68k/configs/ arch/m68k/defconfig was not exactly identical to amiga_defconfig but also considering how long they have been without any update that doesn't seem to have been on purpose. Signed-off-by: Adrian Bunk <adrian.bunk@movial.fi> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
2008-04-09ide-tape: fix mem leakBorislav Petkov
On failed struct idetape_bh allocation the logic frees only one buffer page which was the old page-wise strategy. Doing that now would probably leak 2^order-1 pages so fix it to free all and not only the first buffer page. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: remove tape->merge_stageBorislav Petkov
Get rid of the pipeline merge stage but retain the chrdev req caching functionality by using a merge buffer tape->merge_bh which is flushed in chunks of several blocks at a time. Also, remove last references to pipelining, e.g. typedef idetape_stage_s. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: mv tape->merge_stage_size tape->merge_bh_sizeBorislav Petkov
This is the size of the merge buffer. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: mv idetape_empty_write_pipeline ide_tape_flush_merge_bufferBorislav Petkov
Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: mv idetape_discard_read_pipeline ide_tape_discard_merge_bufferBorislav Petkov
Also, rename its __-low level helper too. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: make __idetape_discard_read_pipeline() of type voidBorislav Petkov
It always returns 0 which has no effect on tape positioning calculation so simplify it by converting its type to void, bringing no functional change to the driver. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: remove now unused ide_pci_create_host_proc()Alexey Dobriyan
It creates files in proc with obsoleted ->get_info interface. Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: remove /proc/ide/aliAlexey Dobriyan
Bart says: "can be done from user-space and is not especially interesting even when debugging problems (raw PCI config space dump is far more useful)." Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: improve buffer pages freeing strategyBorislav Petkov
Instead of freeing pages one by one, free them 2^order-wise. Also, mv __idetape_kfree_stage() to ide_tape_kfree_buffer(). [bart: add updating bh->b_data] Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: mv tape->pages_per_stage tape->pages_per_bufferBorislav Petkov
Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: mv tape->stage_size tape->buffer_sizeBorislav Petkov
Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide-tape: improve buffer allocation strategyBorislav Petkov
Instead of allocating pages for the buffer one by one, take advantage of the buddy alloc system and request them 2^order at a time. This increases the chance for bigger buffer parts to be contigious and reduces loop iteration count. While at it, rename function __idetape_kmalloc_stage() to ide_tape_kmalloc_buffer(). Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: add struct ide_io_portsBartlomiej Zolnierkiewicz
* Add struct ide_io_ports and use it instead of `unsigned long io_ports[]` in ide_hwif_t. * Rename io_ports[] in hw_regs_t to io_ports_array[]. * Use un-named union for 'unsigned long io_ports_array[]' and 'struct ide_io_ports io_ports' in hw_regs_t. * Remove IDE_*_OFFSET defines. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: make 32-bit I/O support for IDE VLB available only when it makes senseBartlomiej Zolnierkiewicz
IDE VLB host drivers depend on ISA && (ALPHA || X86 || MIPS) so only then it makes sense to support "VLB sync" (controlled by SUPPORT_VLB_SYNC define). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: make ide_hwifs[] staticBartlomiej Zolnierkiewicz
Move ide_hwifs[] from ide.c to ide-probe.c and make it static. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: fix hwif-s initializationBartlomiej Zolnierkiewicz
* Add ide_hwifs[] entry initialization to ide_find_port_slot() and remove ide_init_port_data() calls from host drivers. * Unexport ide_init_port_data(). * Remove no longer needed init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: make ide_unregister() take 'ide_hwif_t *' as an argumentBartlomiej Zolnierkiewicz
* Make ide_unregister() take 'ide_hwif_t *hwif' instead of 'unsigned int index' (hwif->index) as an argument and update all users accordingly. While at it: * Remove unnecessary checks for hwif != NULL from ide-pnp.c::idepnp_remove() and delkin_cb.c::delkin_cb_remove(). * Remove needless hwif->chipset assignment from scc_pata.c::scc_remove(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: sanitize ide_unregister() usageBartlomiej Zolnierkiewicz
* Remove ide_unregister() call from ide_exit() (host drivers take care of unregistering hwif-s themselves). * Remove ide_unregister() call from probe methods of bast-ide, palm_bk3710, ide-cs and delkin_cb host drivers (ide_find_port() returns only free ide_hwifs[] entries). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09mpc8xx-ide: use ide_find_port()Bartlomiej Zolnierkiewicz
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: remove obsoleted "ide=" kernel parametersBartlomiej Zolnierkiewicz
* Remove obsoleted "ide=" kernel parameters. * Remove no longer needed: - ide_setup() - parse_options() - __setup("", ...) - module_param(options, ...) * Use module_{init,exit}() for MODULE=y case and remove MODULE ifdef. * Make ide_*acpi* and ide_doubler variables static. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: add "noacpi" / "acpigtf" / "acpionboot" parametersBartlomiej Zolnierkiewicz
* Rename ide_noacpi{tfs,onboot} to ide_acpi{gtf,onboot} (+ reverse logic). * Move ide_*acpi* variables to ide-acpi.c and remove unnecessary initializers. * Add "noacpi" / "acpigtf" / "acpionboot" parameters. * Obsolete "ide=noacpi" / "ide=acpigtf" / "ide=acpionboot" kernel parameters. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09gayle: add "doubler" parameterBartlomiej Zolnierkiewicz
* Add "doubler" parameter to enable support for IDE doublers. * Obsolete "ide=doubler" kernel parameter. Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
2008-04-09ide: cleanup init_ide_data()Bartlomiej Zolnierkiewicz
* Remove no longer need init_ide_data() call from ide_setup(). * Cleanup init_ide_data(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>