aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [WATCHDOG] Kconfig clean upWim Van Sebroeck2006-10-04
| | | | | | | fixed some more trailing spaces. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] w836?7hf_wdt spinlock fixes.Wim Van Sebroeck2006-10-04
| | | | | | | | | | Add io spinlocks to prevent possible race conditions between start and stop operations that are issued from different child processes where the master process opened /dev/watchdog. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] Kconfig clean-upWim Van Sebroeck2006-10-04
| | | | | | | | * fix typo's according to spellings checker * Fix some leading and trailing spaces Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] w83697hf WDT driverMarcus Junker2006-10-04
| | | | | | | | New watchdog driver for the Winbond W83697HF chipset. Signed-off-by: Marcus Junker <junker@anduras.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] Winbond SMsC37B787 watchdog fixesWim Van Sebroeck2006-10-04
| | | | | | | | | | | | | | | * Added io spinlocking * Deleted WATCHDOG_MINOR (it's in the miscdevice include * Changed timer_enabled to use set_bit functions * WDIOC_GETSUPPORT should return -EFAULT or 0 * timeout should be correct before we initialize the watchdog * we should initialize the watchdog before we give access to userspace * Third parameter of module_param is not the default or initial value Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] Winbond SMsC37B787 - remove trailing whitespaceWim Van Sebroeck2006-10-04
| | | | | | | Remove trailing whitespace. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [WATCHDOG] Winbond SMsC37B787 watchdog driverSven Anders2006-10-04
| | | | | | | | New watchdog driver for the Winbond SMsC37B787 chipset. Signed-off-by: Sven Anders <anders@anduras.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
* [S390] cio: improve unit check handling for internal operationsPeter Oberparleiter2006-10-04
| | | | | | | Retry internal operation after unit check instead of aborting them. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] cio: add timeout handler for internal operations.Peter Oberparleiter2006-10-04
| | | | | | | Add timeout handler for common-I/O-layer-internal I/O operations. Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] Remove open-coded mem_map usage.Heiko Carstens2006-10-04
| | | | | | Use page_to_phys and pfn_to_page to avoid open-coded mem_map usage. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* [S390] Have s390 use add_active_range() and free_area_init_nodes.Heiko Carstens2006-10-04
| | | | | | Size zones and holes in an architecture independent manner for s390. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* [S390] Remove crept in whitespace from head*.S again.Heiko Carstens2006-10-04
| | | | Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* [S390] incorrect placement of include.Martin Schwidefsky2006-10-04
| | | | | | | | The include of linux/smp.h needs to be done before the #if that checks for the compiler version. Seems like fallout from the inline assembly cleanup patch vs. the directed yield patch. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] Wire up sys_getcpu system call.Heiko Carstens2006-10-04
| | | | Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
* [S390] zcrypt device registration/unregistration race.Ralph Wuerthner2006-10-04
| | | | | | | Fix a race condition during AP device registration and unregistration. Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] Add timeouts during sense PGID, path verification and disband PGID.Cornelia Huck2006-10-04
| | | | | | | | While the machine owns us an interrupt in these cases (and we should get one), reality isn't always like that... Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] user-copy optimization fallout.Martin Schwidefsky2006-10-04
| | | | | | | | Fix new restore_sigregs function. It copies the user space copy of the old psw without correcting the psw.mask and the psw.addr high order bit. While we are at it, simplify save_sigregs a bit. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* [S390] update default configurationMartin Schwidefsky2006-10-04
| | | | Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
* Merge branch 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2006-10-04
|\ | | | | | | | | | | * 'for-2.6.19' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Document bi_sector and sector_t [PATCH] helper function for retrieving scsi_cmd given host based block layer tag
| * [PATCH] Document bi_sector and sector_tRoger Gammans2006-10-04
| | | | | | | | | | Signed-Off-By: Roger Gammans <rgammans@computer-surgery.co.uk> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
| * [PATCH] helper function for retrieving scsi_cmd given host based block layer tagDavid C Somayajulu2006-10-04
| | | | | | | | | | | | | | | | | | | | This was necessitated by the need for a function to get back to a scsi_cmnd, when an hba the posts its (corresponding) completion interrupt with a block layer tag as its reference. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: David Somayajulu <david.somayajulu@qlogic.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
* | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2006-10-04
|\ \ | | | | | | | | | | | | | | | * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Remove remaining reference to ite_gpio.h from Kbuild [MIPS] PNX8550 fixups
| * | [MIPS] Remove remaining reference to ite_gpio.h from KbuildDavid Woodhouse2006-10-04
| | | | | | | | | | | | | | | Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| * | [MIPS] PNX8550 fixupsVitaly Wool2006-10-04
| |/ | | | | | | | | | | | | | | | | This patch fixes the compilation errors on PNX8550 and hard-to-track bug in interrupt handling. It also corresponds to the latest changes in PNX8550 serial driver. Signed-off-by: Vitaly Wool <vitalywool@gmail.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds2006-10-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4712): Fix warning when compiling on x86_i64 V4L/DVB (4711): Radio: No need to return void V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5 V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI API V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionally V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixup V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM board V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybrid V4L/DVB (4701): Saa713x audio fixes V4L/DVB (4676a): Remove Kconfig item for DiB7000M support
| * | V4L/DVB (4712): Fix warning when compiling on x86_i64Mauro Carvalho Chehab2006-10-04
| | | | | | | | | | | | | | | | | | | | | drivers/media/dvb/dvb-usb/usb-urb.c: In function 'usb_allocate_stream_buffers': drivers/media/dvb/dvb-usb/usb-urb.c:125: warning: format '%u' expects type 'unsigned int', but argument 4 has type 'long long unsigned int' Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4711): Radio: No need to return voidTobias Klauser2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | The module_exit function has return-type void and pci_unregister_driver() returns void anyway. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4708): Add tveeprom support for Philips FM1236/FM1216ME MK5Hans Verkuil2006-10-04
| | | | | | | | | | | | | | | | | | | | | Add new Philips tuners: Philips FM1236 MK5 and Philips FM1216ME MK5. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4707): 4linux: complete conversion to hotplug safe PCI APIAlan Cox2006-10-04
| | | | | | | | | | | | | | | Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4706): Do not enable VIDEO_V4L2 unconditionallyMaciej W. Rozycki2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | The VIDEO_V4L2 config setting is enabled unconditionally, even for configurations with no support for this subsystem whatsoever. The following patch adds the necessary dependency. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4704): SAA713x: fixed compile warning in SECAM fixupHartmut Hackmann2006-10-04
| | | | | | | | | | | | | | | | | | | | | The variable fixup could be used uninitialized. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4703): Add support for the ASUS EUROPA2 OEM boardHartmut Hackmann2006-10-04
| | | | | | | | | | | | | | | | | | | | | This is a analog DVB-T hybrid board Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4702): Fix: set antenna input for DVB-T for Asus P7131 Dual hybridHermann Pitton2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch forces the correct antenna input input in DVB-T mode for this card. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4701): Saa713x audio fixesHartmut Hackmann2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the following issues: - resolve the SECAM D/K vs SECAM-L sound conflict It is now possible to select the SECAM version either by the VIDEOIOC_S_STD IO control or by the new secam= insmod option. The driver now adapts its audio standard search list to the selected standard. - don't trigger a sound standard search when a LINE input is selected. Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| * | V4L/DVB (4676a): Remove Kconfig item for DiB7000M supportMauro Carvalho Chehab2006-10-04
| | | | | | | | | | | | | | | | | | | | | Support for DiB7000M frontend were not included on 2.6.19, since still not completed. Removing Kconfig item. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* | | [PATCH] atmel_serial: Fix roundoff error in atmel_console_get_optionsHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The atmel_console_get_options() function initializes the baud, parity and bits settings from the actual hardware setup, in case it has been initialized by a e.g. boot loader. The baud rate, however, is not necessarily exactly equal to one of the standard baud rates (115200, etc.) This means that the baud rate calculated by this function may be slightly higher or slightly lower than one of the standard baud rates. If the baud rate is slightly lower than the target, this causes problems when uart_set_option() tries to match the detected baud rate against the standard baud rate, as it will always select a baud rate that is lower or equal to the target rate. For example if the detected baud rate is slightly lower than 115200, usart_set_options() will select 57600. This patch fixes the problem by subtracting 1 from the value in BRGR when calculating the baud rate. The detected baud rate will thus always be higher than the nearest standard baud rate, and uart_set_options() will end up doing the right thing. Tested on ATSTK1000 and AT91RM9200-EK boards. Both are broken without this patch. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] AVR32: Allow renumbering of serial devicesHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the board to remap actual USART peripheral devices to serial devices by calling at32_map_usart(hw_id, serial_line). This ensures that even though ATSTK1002 uses USART1 as the first serial port, it will still have a ttyS0 device. This also adds a board-specific early setup hook and moves the at32_setup_serial_console() call there from the platform code. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] atmel_serial: Support AVR32Haavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make CONFIG_SERIAL_ATMEL selectable on AVR32 and #ifdef out some ARM- specific code in the driver. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] atmel_serial: Pass fixed register mappings through platform_dataHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to initialize the serial console early, the atmel_serial driver had to do a hack where it compared the physical address of the port with an address known to be permanently mapped, and used it as a virtual address. This got around the limitation that ioremap() isn't always available when the console is being initalized. This patch removes that hack and replaces it with a new "regs" field in struct atmel_uart_data that the board-specific code can initialize to a fixed virtual mapping for platform devices where this is possible. It also initializes the DBGU's regs field with the address the driver used to check against. On AVR32, the "regs" field is initialized from the physical base address when this it can be accessed through a permanently 1:1 mapped segment, i.e. the P4 segment. If regs is NULL, the console initialization is delayed until the "real" driver is up and running and ioremap() can be used. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] atmel_serial: Rename at91_register_uart_fnsHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename at91_register_uart_fns and associated structs and variables to make it consistent with the atmel_ prefix used by the rest of the driver. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] serial: Rename PORT_AT91 -> PORT_ATMELHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The at91_serial driver can be used with both AT32 and AT91 devices from Atmel and has therefore been renamed atmel_serial. The only thing left is to rename PORT_AT91 PORT_ATMEL. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: Internal namesHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix all internal functions and variables with atmel_ instead of at91_. The at91_register_uart_fns() stuff is left as is since I can't find any actual users of it. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: Public definitionsHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the following public definitions: * AT91_NR_UART -> ATMEL_MAX_UART * struct at91_uart_data -> struct atmel_uart_data * at91_default_console_device -> atmel_default_console_device Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: Platform device nameHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the "at91_usart" platform driver "atmel_usart" and update platform devices accordingly. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: Kconfig symbolsHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the following Kconfig symbols: * CONFIG_SERIAL_AT91 -> CONFIG_SERIAL_ATMEL * CONFIG_SERIAL_AT91_CONSOLE -> CONFIG_SERIAL_ATMEL_CONSOLE * CONFIG_SERIAL_AT91_TTYAT -> CONFIG_SERIAL_ATMEL_TTYAT Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: at91_serial.cHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | Rename at91_serial.c atmel_serial.c Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] at91_serial -> atmel_serial: at91rm9200_usart.hHaavard Skinnemoen2006-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move include/asm/arch/at91rm9200_usart.h into drivers/serial and rename it atmel_usart.h. Also delete AVR32's version of this file. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Acked-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/confighLinus Torvalds2006-10-04
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of <linux/config.h> Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory.
| * | Remove all inclusions of <linux/config.h>Dave Jones2006-10-04
| |/ | | | | | | | | | | kbuild explicitly includes this at build time. Signed-off-by: Dave Jones <davej@redhat.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6Linus Torvalds2006-10-04
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6: (292 commits) [GFS2] Fix endian bug for de_type [GFS2] Initialize SELinux extended attributes at inode creation time. [GFS2] Move logging code into log.c (mostly) [GFS2] Mark nlink cleared so VFS sees it happen [GFS2] Two redundant casts removed [GFS2] Remove uneeded endian conversion [GFS2] Remove duplicate sb reading code [GFS2] Mark metadata reads for blktrace [GFS2] Remove iflags.h, use FS_ [GFS2] Fix code style/indent in ops_file.c [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits) [GFS2] inode-diet: Eliminate i_blksize from the inode structure [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs) [GFS2] Fix typo in last patch [GFS2] Fix direct i/o logic in filemap.c [GFS2] Fix bug in Makefiles for lock modules [GFS2] Remove (extra) fs_subsys declaration [GFS2/DLM] Fix trailing whitespace [GFS2] Tidy up meta_io code ...
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-26 07:05:22 -0500