aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
Commit message (Collapse)AuthorAge
* drm: remove unused components of drm structuresDave Airlie2005-10-24
| | | | | | These haven't been used in quite a long time, takes 1K buffer out of structures. Signed-off-by: Dave Airlie <airlied@linux.ie>
* drm: fix warning on 64-bit platforms..Dave Airlie2005-10-24
| | | | | | | This looks ugly, but it is the only thing that makes sense that doesn't change the API. Signed-off-by: Dave Airlie <airlied@linux.ie>
* merge linus head to drm-mm branchDave Airlie2005-10-22
|
* merge linus head to drm-mm branchDave Airlie2005-10-22
|\
| * [PATCH] drm: another mga bugDave Airlie2005-10-21
| | | | | | | | | | | | | | | | The wrong state emission routines were being called for G550, and consistent maps weren't correctly mapped... Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | merge Linus head tree into my drm tree and fix up conflictsDave Airlie2005-10-20
|\|
| * [PATCH] fix MGA DRM regression before 2.6.14Dave Airlie2005-10-20
| | | | | | | | | | | | | | | | | | | | | | | | I've gotten a report on lkml, of a possible regression in the MGA DRM in 2.6.14-rc4 (since -rc1), I haven't been able to reproduce it here, but I've figured out some possible issues in the mga code that were definitely wrong, some of these are from DRM CVS, the main fix is the agp enable bit on the old code path still used by everyone..... Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Add some basic .gitignore filesLinus Torvalds2005-10-18
| | | | | | | | | | | | | | | | This still leaves driver and architecture-specific subdirectories alone, but gets rid of the bulk of the "generic" generated files that we should ignore. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] n_r3964 mod_timer() fixStephan Brodkorb2005-10-17
| | | | | | | | | | | | | | | | | | | | | | Since Revision 1.10 was released the n_r3964 module wasn't able to receive any data. The reason for that behavior is because there were some wrong calls of mod_timer(...) in the function receive_char (...). This patch should fix this problem and was successfully tested with talking to some kuka industrial robots. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Pull mbcs-init-sn-check into release branchTony Luck2005-10-11
| |\
| | * [IA64] mbcs_init() should give up unless running on sn2Greg Edwards2005-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_SGI_MBCS is enabled in generic kernels, but the driver may oops some other platforms. Check whether we are running on sn2 and bail out if we are not before doing anything dangerous. Acked-by: Bruce Losure <blosure@americas.sgi.com> Signed-off-by: Greg Edwards <edwardsg@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [ARM] 2963/1: S3C2410 - add .owner field to device_driverBen Dooks2005-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch from Ben Dooks Add initialisation of .owner field so that the device driver can be referenced to the module that owns it. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2005-10-08
| |\ \
| | * | [WATCHDOG] pcwd_pci.c add debug module_paramWim Van Sebroeck2005-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Add debugging code for the pcwd_pci driver. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * | [WATCHDOG] pcwd_pci.c control status + boot-code clean-upWim Van Sebroeck2005-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean-up control status code (use control status defines + change pcipcwd_clear_status) * Clean-up boot-code (move card info to pcipcwd_show_card_info() ) Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| * | | [PATCH] Fix drm 'debug' sysfs permissionsDave Jones2005-10-05
| | |/ | |/| | | | | | | | | | | | | | | | Just enables some extra printk's, but still.. Only the sysadmin should be able to do that. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] mv64x60_wdt __user annotations and cleanupsAl Viro2005-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use nonseekable_open() instead of messing with if (*ppos != file->f_pos) return -EISPIPE in ->write() (->read is NULL). - trivial __user annotations Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] n_r3964: drop bogus fmt castsAlexey Dobriyan2005-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | - print pointers with %p - casting pointer structure field to int and printing it with %d... Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] proc_mkdir() should be used to create procfs directoriesAl Viro2005-09-29
| |/ | | | | | | | | | | | | | | A bunch of create_proc_dir_entry() calls creating directories had crept in since the last sweep; converted to proc_mkdir(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Add IPMI poweroff control to sysfsCorey Minyard2005-09-28
| | | | | | | | | | | | | | | | | | Put the IPMI poweroff_powercycle parameter into sysfs. This field is dynamically settable and is valuable to have in sysfs. Signed-off-by: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | drm: fix drm PCIGARTDave Airlie2005-09-30
| | | | | | | | | | | | PCI Express support broke PCIGART Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: fix all sparse warning on 32-bit x86Dave Airlie2005-09-30
| | | | | | | | | | | | Finally cleaned up the sparse warnings for the drm. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: add option to force writeback off.Dave Airlie2005-09-30
| | | | | | | | | | | | | | In order to get some better debugging from people about certain hangs/crashes we need to be able to turn AGP writeback off permanently... Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: fix some lindent damageDave Airlie2005-09-25
| | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: cast handle to a pointer to avoid warningDave Airlie2005-09-25
| | | | | | | | | | | | Andrew reported a warning on this line, just case to void *. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: lindent the drm directory.Dave Airlie2005-09-25
| | | | | | | | | | | | | | | | | | I've been threatening this for a while, so no point hanging around. This lindents the DRM code which was always really bad in tabbing department. I've also fixed some misnamed files in comments and removed some trailing whitespace. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | drm: use kernel macrosDave Airlie2005-09-24
| | | | | | | | | | | | Make some of the DRM_ macros use the real kernel macros. Signed-off-by: Dave Airlie <airlied@linux.ie>
* | update from upstreamDave Airlie2005-09-24
|\|
| * [PATCH] ipmi_msghandler: inconsistent spin_lock usageHironobu Ishii2005-09-23
| | | | | | | | | | | | | | | | | | I found an inconsistent spin_lock usage in ipmi_smi_msg_received. Signed-off-by: Hironobu Ishii <hishii@soft.fujitsu.com> Cc: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] Fix mmap() of /dev/hpetKeir Fraser2005-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The address passed to io_remap_pfn_range() in hpet_mmap() does not need to be converted using __pa(): it is already a physical address. This bug was found and the patch suggested by Clay Harris. I introduced this particular bug when making io_remap_pfn_range changes a few months ago. In fact mmap()ing /dev/hpet has *never* previously worked: before my changes __pa() was being executed on an ioremap()ed virtual address, which is also invalid. Signed-off-by: Keir Fraser <keir@xensource.com> Cc: Robert Picco <Robert.Picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge branch 'release' of ↵Linus Torvalds2005-09-16
| |\ | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
| | * [IA64] Remove warnings for gcc 4.0 IA64 compilation.Peter Chubb2005-09-16
| | | | | | | | | | | | | | | | | | | | | | | | This patch removes some compilation warnings, mostly trivially. acpi.c fix also noted by Kenji Kaneshige. Signed-off-by; Peter Chubb <peterc@gelato.unsw.edu.au> Signed-off-by: Tony Luck <tony.luck@intel.com>
| * | [PATCH] epca iomem annotations + several missing readw()Al Viro2005-09-16
| |/ | | | | | | | | | | | | | | | | | | [originally sent to Alan, he had no problems with it] - iomem pointers marked as such - several direct dereferencings of such pointers replaced with read[bw](). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * [PATCH] vc: Use correct size on buffer copy in vc_resizeAntonino A. Daplas2005-09-15
| | | | | | | | | | | | | | | | | | In the unlikely case of the new screen width much wider then the old, use (old_row_size * new_rows) instead of new_screen_size to prevent a buffer overrun during the copy. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp Linus Torvalds2005-09-14
| |\
| | * [ARM SMP] Add timer/watchdog defines for MPCoreRussell King2005-09-14
| | | | | | | | | | | | | | | | | | | | | The timer/watchdog register definitions were missing from the mpcore watchdog patch. Add them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | [PATCH] hvc_console: start kernel thread before registering ttyAnton Blanchard2005-09-14
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its possible that we can write to the hvc_console tty as soon it is registered. Recently this started happening due to (what looks like) a change to the hotplug code. Unfortunately at this stage we have not started the khvcd kernel thread and oops. The solution is to start the kernel thread before registering the tty. Signed-off-by: Anton Blanchard <anton@samba.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog Linus Torvalds2005-09-13
| |\
| | * [WATCHDOG] pcwd_pci-include+WDIOC_SETOPTIONS-patchWim Van Sebroeck2005-09-12
| | | | | | | | | | | | | | | | | | | | | Clean-up includes Check results for start + stop in the WDIOC_SETOPTIONS ioctl call Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * [WATCHDOG] sbc8360+w83977f_wdt-consolidate_CONFIG_WATCHDOG_NOWAYOUT_handlingWim Van Sebroeck2005-09-12
| | | | | | | | | | | | | | | | | | | | | Attached patch removes #ifdef CONFIG_WATCHDOG_NOWAYOUT mess and replaces it with common define in linux/watchdog.h. Signed-Off-By: Wim Van Sebroeck <wim@iguana.be>
| | * [WATCHDOG] w83977f-watchdog-driver.patchJose Miguel Goncalves2005-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a project for my company I've needed to use the watchdog device in a PCM-5335 SBC from AAEON. The watchdog timer is from a Winbond's SuperIO chip, the W83977F. I've made this driver based on two others already on the kernel tree, the w83877f_wdt and the wdt977. Signed-off-by: Jose Goncalves <jose.goncalves@inov.pt> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * [WATCHDOG] New SBC8360 watchdog driver (revised)Ian E. Morgan2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | New SBC8360 watchdog driver patch From: Ian E. Morgan <imorgan@webcon.ca> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fix2.patchWim Van Sebroeck2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device/watchdog has a fixed timeout/heartbeat. So we don't support the WDIOC_SETTIMEOUT ioctl call and we also may not set the WDIOF_SETTIMEOUT flag. Cc: Andrey Panin <pazke@donpac.ru> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| | * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog-fixAndrew Morton2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | Add fixed timeout comments Cc: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] driver-for-ibm-automatic-server-restart-watchdog.patchAndrey Panin2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds driver for IBM Automatic Server Restart watchdog hardware found in some IBM eServer xSeries machines. This driver is based on the ugly driver provided by IBM. Driver was tested on IBM eServer 226. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] i6300.h-removal-patchDavid Hardeman2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the attached patch moves the content of drivers/char/watchdog/i6300.h into drivers/char/watchdog/i6300.c, since it is the only file using the defines there is no real reason to have a separate header. Also cleaned up the comments a bit and added myself to the copyright holders. Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patchJiri Slaby2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In i6300esb.c watchdog card driver were 2 bugs (misused pc_match_device and pci_dev_put wasn't called in one error case) and one little cleanup was done (long line was converted to a shorter one with using built-in macro). Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] i6300esb.c-pci_dev_put+nowayout-patchNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One pci_dev_put was misused (there was one case without putting the device). Changed nowayout according to other drivers. Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz> Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] i6300esb-set_correct_reload_register_bitNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch writes into bit 8 of the reload register to perform the correct 'Reload Sequence' instead of writing into bit 4 of Watchdog for Intel 6300ESB chipset. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
| | * [WATCHDOG] i6300esb.c-WDT_ENABLE-bugNaveen Gupta2005-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch sets the WDT_ENABLE bit of the Lock Register to enable the watchdog and WDT_LOCK bit only if nowayout is set. The old code always sets the WDT_LOCK bit of watchdog timer for Intel 6300ESB chipset. So, we end up locking the watchdog instead of enabling it. Signed-off-by: Naveen Gupta <ngupta@google.com> Signed-off-by: David Hardeman <david@2gen.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@osdl.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-29 12:08:17 -0500