summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Sun HME: enable and map PCI ROM properlyWilly Tarreau2005-09-111-26/+17
| | | | | | | | | | | This ports the Sun GEM ROM mapping/enable fixes it sunhme (which used the same PCI ROM mapping code). Without this, I get NULL MAC addresses for all 4 ports (it's a SUN QFE). With it, I get the correct addresses (the ones printed on the label on the card). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Sun GEM ethernet: enable and map PCI ROM properlyLinus Torvalds2005-09-111-22/+14
| | | | | | | | | This same patch was reported to fix the MAC address detection on sunhme (next patch). Most people seem to be running this on Sparcs or PPC machines, where we get the MAC address from their respective firmware rather than from the (previously broken) ROM mapping routines. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* hpt366: write the full 4 bytes of ROM address, not just low 1 byteLinus Torvalds2005-09-111-2/+6
| | | | | | | | | This is one heck of a confused driver. It uses a byte write to a dword register to enable a ROM resource that it doesn't even seem to be using. "Lost and wandering in the desert of confusion" Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/home/rmk/linux-2.6-mmc Linus Torvalds2005-09-111-22/+5
|\
| * [MMC] Add mmc_detect_change() delay support for wbsd driverRussell King2005-09-101-22/+5
| | | | | | | | | | | | | | Convert wbsd to use the new delay functionality in mmc_detect_change() rather than implementing its own timer. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [MFD] Cleanups suggested by Dmitri, Vojtech and lists.Pavel Machek2005-09-111-48/+17
| | | | | | | | | | | | | | | | These are small ucb1x00-ts cleanups, as suggested by Vojtech, Dmitri and the lists. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [MFD] Add code UCB1200/UCB1300 assabet platform supportRussell King2005-09-112-0/+77
| | | | | | | | | | | | | | Add support for Intel assabet specific board support for UCB1200/UCB1300 devices. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [MFD] Add code UCB1200/UCB1300 touchscreen supportRussell King2005-09-113-0/+435
| | | | | | | | | | | | | | Add support for Philips UCB1200 and UCB1300 touchscreen interfaces found on ARM devices. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | [MFD] Add code UCB1200/UCB1300 device supportRussell King2005-09-114-0/+927
| | | | | | | | | | | | | | | | | | | | | | | | Add the core device support code for the Philips UCB1200 and UCB1300 devices. Also includes the following from Pavel: This fixes u32 vs. pm_message_t confusion and uses cleaner try_to_freeze() [fixing compilation as a side-effect on newer kernels.] Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Linus Torvalds2005-09-109-140/+115
|\ \
| * | [TCP]: Fix double adjustment of tp->{lost,left}_out in tcp_fragment().Herbert Xu2005-09-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | There is an extra left_out/lost_out adjustment in tcp_fragment which means that the lost_out accounting is always wrong. This patch removes that chunk of code. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/ David S. Miller2005-09-108-135/+115
| |\ \
| | * | [IPV6]: Bring Type 0 routing header in-line with rfc3542.Brian Haley2005-09-103-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542 David S. Miller2005-09-101-20/+36
| | |\ \
| | | * | [IPV6]: Note values allocated for ip6_tables.YOSHIFUJI Hideaki2005-09-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid future conflicts, add a note values allocated for ip6_tables. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| | | * | [IPV6]: rearrange constants for new advanced API to solve conflicts.YOSHIFUJI Hideaki2005-09-101-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64, 65 are already used in ip6_tables. Pointed out by Patrick McHardy <kaber@trash.net>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
| | * | | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 David S. Miller2005-09-104-105/+70
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | [CCID3] Cleanup ccid3 debug callsArnaldo Carvalho de Melo2005-09-091-97/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also use some BUG_ON where appropriate and use LIMIT_NETDEBUG for the unlikely cases where we, at this stage, want to know about, that in my tests hasn't appeared in the radar. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
| | | * | [DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sockArnaldo Carvalho de Melo2005-09-092-7/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
| | | * | [CCID3] Initialize ccid3hctx_t_ipi to 250msArnaldo Carvalho de Melo2005-09-092-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To match more closely what is described in RFC 3448. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: Ian McDonald <iam4@cs.waikato.ac.nz>
* | | | | [PATCH] Fix breakage on ppc{,64} by "nvidiafb: Fallback to firmware EDID"Alexey Dobriyan2005-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix drivers/video/nvidia/nv_of.c:34: error: conflicting types for 'nvidia_probe_i2c_connector' drivers/video/nvidia/nv_proto.h:38: error: previous declaration of 'nvidia_probe_i2c_connector' was here Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Al Viro <viro@ZenIV.linux.org.uk> Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | [PATCH] uml spinlock breakageAl Viro2005-09-101-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingo missed that one... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input Linus Torvalds2005-09-1026-312/+986
|\ \ \ \ \
| * | | | | Input: i8042 - use kzalloc instead of kcallocDmitry Torokhov2005-09-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: clean up whitespace and formatting in drivers/char/keyboard.cDmitry Torokhov2005-09-101-54/+55
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Manual merge with LinusDmitry Torokhov2005-09-093056-123820/+143569
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Input: HIDDEV - make HIDIOCSREPORT wait IO completionStefan Nickl2005-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to make the hiddev driver issue several Set_Report control transfers to a custom device with 2.6.13-rc6, only the first transfer in a row is carried out, while others immediately following it are silently dropped. This happens where hid_submit_report() (in hid-core.c) tests for HID_CTRL_RUNNING, which seems to be still set because the first transfer is not finished yet. As a workaround, inserting a delay between the two calls to ioctl(HIDIOCSREPORT) in userspace "solves" the problem. The straightforward fix is to add a call to hid_wait_io() to the implementation of HIDIOCSREPORT (in hiddev.c), just like for HIDIOCGREPORT. Works fine for me. Apparently, this issue has some history: http://marc.theaimsgroup.com/?l=linux-usb-users&m=111100670105558&w=2 Signed-off-by: Stefan Nickl <Stefan.Nickl@kontron.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add Wireless Security Lock to HID blacklistBrian Schau2005-09-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device is a Wireless Security Lock (WSL). The device identifies itself as a Cypress Ultra Mouse. It is, however, not a mouse at all and as such, shouldn't be handled as one. Signed-off-by: Brian Schau <brian@schau.com> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add mapping for Powerbook USB keyboardStelian Pop2005-09-052-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map custom HID events (such as the ones generated by some Logitech and Apple Powerbooks USB keyboards) to the FN keycode. Signed-off-by: Stelian Pop <stelian@popies.net> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add the Trust Predator TH 400 gamepad to the badpad listVojtech Pavlik2005-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Karl Relton <karllinuxtest.relton@ntlworld.com> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add a quirk for the Apple PowermouseVojtech Pavlik2005-09-053-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a quirk for the Apple Powermouse, remapping GenericDesktop.Z to Rel.HWheel, to allow horizontal scrolling in Linux. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - fix URB success status handlingVojtech Pavlik2005-09-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing break; statement to the URB status handling in hid-core.c, avoiding flushing the request queue on success. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: sunkbd - extend mapping to handle Type-6 Sun keyboardsVojtech Pavlik2005-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map an unmarked key at 'Esc' position to KEY_MACRO Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: iforce - use wait_event_interruptible_timeoutVojtech Pavlik2005-09-052-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout while() loops in iforce-packets.c lack a set_current_state(TASK_INTERRUPTIBLE); call. The right solution is to replace them with wait_event_interruptible_timeout(). Reported-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add support for Logitech UltraX Media Remote controlMicah F. Galizia2005-09-051-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hid now supports the Logitech UltraX Media Remote control. For now, ID 45 on the consumer usage page has been incorrectly mapped to KEY_RADIO since no other devices uses it. Signed-off-by: Micah F. Galizia <mfgalizi@csd.uwo.ca> Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - handle multi-transascion reportsMichael Haboustak2005-09-052-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes handling of multi-transaction reports for HID devices. New function hid_size_buffers() that calculates the longest report for each endpoint and stores the result in the hid_device object. These lengths are used to allocate buffers that are large enough to store any report on the endpoint. For compatibility, the minimum size for an endpoint buffer set to HID_BUFFER_SIZE rather than the known optimal case (the longest report length). It fixes bug #3063 in bugzilla. Signed-off-by: Michael Haboustak <mike-@cinci.rr.com> I simplified the patch a bit to use just a single buffer size. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: atkbd - handle keyboards generating scancode 0x7fVojtech Pavlik2005-09-051-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend bat_xl handling to do err_xl handling, so that keyboards using 0x7f scancode for regular keys can work. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: HID - add more consumer usagesVojtech Pavlik2005-09-054-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend mapping of the consumer usage page in hid-input.c to handle more cases appearing on new USB keyboards. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: add HID simulation mappingsVojtech Pavlik2005-09-053-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add simulation usage page mappings to hid-input.c to support a new crop of joysticks using them to designate Rudder and Throttle controls. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Inpur: recognize and ignore Logitech vendor usages in HIDVojtech Pavlik2005-09-052-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These get in our way with MX mice. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: i8042 - add Lifebook E4010 to MUX blacklistDmitry Torokhov2005-09-041-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: i8042 - add i8042.nokbd module option to allow supressingDmitry Torokhov2005-09-043-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation of keyboard port. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: i8042 - fix IRQ printing when either KBD or AUX portDmitry Torokhov2005-09-041-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is absent from ACPI/PNP tables. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: make i8042_platform_init return 'real' error codeDmitry Torokhov2005-09-046-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: i8042 - clean up initialization code; abort if weDmitry Torokhov2005-09-041-78/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can't create all ports. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: fix checking whether new keycode fits size-wiseIan Campbell2005-09-042-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dev->keycodesize == sizeof(int) the old code produces incorrect result. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: psmouse - add new Logitech wheel mouse modelVojtech Pavlik2005-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: ALPS - fix wheel decodingVojtech Pavlik2005-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Input: rework psmouse attributes to reduce module sizeDmitry Torokhov2005-09-044-163/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange attribute code to use generic show and set handlers instead of replicating them for every attribute; switch to using attribute_group instead of creating all attributes manually. All this saves about 4K. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | | | | Merge HEAD from ↵Dmitry Torokhov2005-09-041505-26364/+115983
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
OpenPOWER on IntegriCloud