summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] USB: add HP49G+ Calculator USB Serial supportArthur Huillet2005-04-233-0/+107
| | | | | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] USB: clean up all iPod models in unusual_devs.hSven Anderson2005-04-231-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Phil Dibowitz wrote: > 1. You're adding product IDs 1202, 1203, 1204, and 1205. 1203 was > already there, but you remove it, OK, but 1205 is already there, so > you'll need to fix that. I was not removing 1203, it's just the extension of the bcd range. You are right about 1205, as I wrote, it was a patch against 2.6.11.7. Attached is a patch against 2.6.12-rc2. > 2. I'm OK with the full bcd range if Apple is changing it on firmware > revs... fine, but it's bcd, not hex... 0x9999 =) I just copied from other entries. There're a lot 0xffffs in unusual_dev.h, so I assumed it is correct. I changed it to 0x9999. > 3. It's rather obnoxious to take the original submitter's credit away. I didn't remove it, I changed it to "based on...". Because I changed something (the range) in his entry, I thought it is the best to take the responsibility but keep the origin. Anyway, in the new patch I did it in a different way. > 4. Your /proc/bus/usb/devices shows 1204, but I see no evidence 1202 is > really an iPod. I don't have an old iPod mini, but you find a lot of evidence here: http://www.google.com/search?q=0x1202+ipod Especially this one: http://www.qbik.ch/usb/devices/showdescr.php?id=2737 > It also looks like 1205's entry is getting mangled, but I haven't > attempted to apply the patch, so I'm not sure. No, the patch was ok, but I agree it looks strange. It's not very readable, because I cannot tell diff to work blockwise instead of linewise. Because of the similarity of the entries, diff splits and merges them. Anyway, the new patch "looks" better. ;-) Signed-off-by: Sven Anderson <sven-linux@anderson.de> Signed-off-by: Phil Dibowitz <phil@ipom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] USB: compilation failure on usb/image/microtek.cHideaki YOSHIFUJI2005-04-231-1/+1
| | | | | | | | maybe typo? Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* [PATCH] x86_64: fix new out of line put_user()Alexander Nyberg2005-04-221-6/+6
| | | | | | | | The labels after the last put_user patch were misplaced so exceptions on the real mov instructions would not be handled. Noted by Brian Gerst <bgerst@didntduck.org>
* Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.gitLinus Torvalds2005-04-226-30/+148
|\
| * [SPARC64]: In sunsab driver, make sure to set the uart timeout.David S. Miller2005-04-221-5/+11
| | | | | | | | | | | | | | This breaks serial consoles badly. Thanks to Eric Brower for tracking down the problem. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC64]: In sunsu driver, make sure to fully init chip for kbd/msDavid S. Miller2005-04-221-2/+9
| | | | | | | | | | | | | | | | | | We were forgetting to call sunsu_change_speed(). The reason that replugging in the mouse cable "fixes things" is that causes a BREAK interrupt which in turn caused a call to sunsu_change_speed() which would get the chip setup properly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC]: Provide generic ioctls in Sparc RTC driver.David S. Miller2005-04-223-23/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide support for drivers/char/rtc.c ioctls in the Mostek rtc driver as well as the Sparc specific RTCGET and RTCSET. This allows userspace to be much less messy. Currently util-linux and other spots jump through hoops trying various ioctl variants until it hits the right one whatever driver actually being used supports. Eventually all of this should move over to the genrtc.c driver, but not today... While we are here, fix up the register types for sparse. Thanks to Frans Pop for helping point out this issue. Signed-off-by: David S. Miller <davem@davemloft.net>
| * [SPARC64]: Provide a pgprot_noncached() implementation.David S. Miller2005-04-221-0/+5
| | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* | [XFRM]: Fix existence lookup in xfrm_state_findPatrick McHardy2005-04-221-2/+3
| | | | | | | | | | | | | | | | | | Use 'daddr' instead of &tmpl->id.daddr, since the latter might be zero. Also, only perform the lookup when tmpl->id.spi is non-zero. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Add msi testMichael Chan2005-04-221-3/+151
| | | | | | | | | | | | | | | | | | Add MSI test for chips that support MSI. If MSI test fails, it will switch back to INTx mode and will print a message asking the user to report the failure. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Add msi supportMichael Chan2005-04-222-5/+72
| | | | | | | | | | | | | | Add MSI support for 5751 C0 and 5752. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Fix bug in tg3_set_eeprom()Michael Chan2005-04-221-1/+3
| | | | | | | | | | | | | | | | Fix a bug in tg3_set_eeprom() when the length is less than 4 and the offset is not 4-byte aligned. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Add nvram lock-out support for 5752 TPMMichael Chan2005-04-222-34/+37
| | | | | | | | | | | | | | | | Add support for the NVRAM lock-out feature for TPM in 5752. If lock-out is enabled, certain NVRAM registers cannot be written to. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Add nvram detection for 5752Michael Chan2005-04-222-1/+76
| | | | | | | | | | Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Add GPIO3 for 5752Michael Chan2005-04-222-0/+13
| | | | | | | | | | | | | | | | Add bit definitions for the new GPIO3 in 5752. GPIO3 must be driven as output when it is unused. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Workaround 5752 A0 chip IDMichael Chan2005-04-222-5/+10
| | | | | | | | | | | | | | | | | | | | The 5752 A0 chip ID is wrong in hardware. The simplest way to workaround it is to change it to the correct value in tp->pci_chip_rev_id. This way, it is easier to check for the ASIC_REV_5752 in the rest of the driver. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Fix tg3_set_power_state()Michael Chan2005-04-221-2/+8
| | | | | | | | | | | | | | | | | | Fix tg3_set_power_state to drive GPIOs properly based on the TG3_FLAG_EEPROM_WRITE_PROTECT flag. Some delays are also added after D0 and D3 power state changes. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Setup proper GPIO settingsMichael Chan2005-04-221-6/+28
| | | | | | | | | | | | | | | | Setup proper GPIO settings in tp->grc_local_ctrl before calling tg3_set_power() state in tg3_get_invariants() and after chip reset. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Split tg3_phy_probe into 2 functionsMichael Chan2005-04-221-17/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the 1st half of tg3_phy_probe() into tg3_get_eeprom_hw_cfg() so that the TG3_FLAG_EEPROM_WRITE_PROT can be determined before calling tg3_set_power_state() in tg3_get_invariants(). This will allow tg3_set_power_state() to drive the GPIOs correctly based on the config. information in eeprom. On the 5752, there are no pull-up resistors on the GPIO pins and it is necessary to drive the unused GPIOs as output. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: Minor 5752 fixesMichael Chan2005-04-222-7/+18
| | | | | | | | | | | | | | Some minor 5752 fixes mostly for correctness and add 5752 PHY ID. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: add support for bcm5752 rev a1John W. Linville2005-04-222-2/+6
| | | | | | | | | | | | | | | | | | Replace existing ASIC_REV_5752 definition with ASIC_REV_5752_A0, and add definition for ASIC_REV_5752_A1. Then, add ASIC_REV_5752_A1 to check for setting TG3_FLG2_5750_PLUS in tg3_get_invariants. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flagJohn W. Linville2005-04-221-5/+4Star
| | | | | | | | | | | | | | | | Use check of TG3_FLG2_5750_PLUS in tg3_get_invariants to set TG3_FLG2_5705_PLUS flag. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariantsJohn W. Linville2005-04-221-5/+2Star
| | | | | | | | | | | | | | | | Rewrite checks in tg3_get_invariants to use TG3_FLG2_5705_PLUS and TG3_FLG2_5750_PLUS flags. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: more use of TG3_FLG2_5705_PLUS flagJohn W. Linville2005-04-221-8/+4Star
| | | | | | | | | | | | | | | | Rewrite of a couple of troublesome multi-way if statements to use TG3_FLG2_5705_PLUS flag. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: use new TG3_FLG2_5750_PLUS flagJohn W. Linville2005-04-221-25/+13Star
| | | | | | | | | | | | | | | | Replace a number of two-way if statements checking for 5750, and/or 5752 to reference the newly-defined TG3_FLG2_5750_PLUS flag instead. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: define TG3_FLG2_5750_PLUS flagJohn W. Linville2005-04-222-0/+5
| | | | | | | | | | | | | | | | Define TG3_FLG2_5750_PLUS flag and set it in tg3_get_invariants for ASIC_REV_5750 or ASIC_REV_5752. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: use TG3_FLG2_5705_PLUS instead of multi-way if'sJohn W. Linville2005-04-221-12/+4Star
| | | | | | | | | | | | | | | | Replace a number of three-way if statements checking for 5705, 5750, and 5752 to reference the equivalent TG3_FLG2_5705_PLUS flag instead. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: add bcm5752 entry to pci_ids.hJohn W. Linville2005-04-222-1/+2
| | | | | | | | | | | | | | | | | | Add proper entry for bcm5752 PCI ID to pci_ids.h, and use it in tg3. I did this separately in case patches like this (i.e. new PCI IDs) need to come from more "official" sources. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: add bcm5752 to tg3_pci_tblJohn W. Linville2005-04-221-0/+2
| | | | | | | | | | | | | | | | Add hard-coded definition of bcm5752 PCI ID to tg3_pci_tbl. Next patch will change entry to use pci_ids.h-based definition. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [TG3]: add basic bcm5752 supportJohn W. Linville2005-04-222-21/+43
| | | | | | | | | | | | | | | | | | | | Add ASIC_REV_5752 definition. Track-down all references to ASIC_REV_5750 and mirror them with references to the newly defined ASIC_REV_5752. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [ATM]: net/atm/resources.c: remove __free_atm_devAdrian Bunk2005-04-221-8/+3Star
| | | | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [AX25]: make ax25_queue_xmit a net_device parameterArnaldo Carvalho de Melo2005-04-225-15/+7Star
| | | | | | | | | | | | | | | | | | | | | | | | I.e. not using skb->dev as a way to pass the parameter used to fill... skb->dev :-) Also to get the _type_trans open coded sequence grouped, next changesets will introduce ax25_type_trans. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [ATM]: sk_atm() conversion missed subtle change of vccChas Williams2005-04-221-0/+1
| | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [NET]: Add missing newline for skb_*_panicPatrick McHardy2005-04-221-4/+8
|/ | | | | | | | While we're at it, lets also replace KERN_INFO by KERN_EMERG to make sure the user gets to see it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* [PATCH] fix subarch breakage in amd dual core updatesJames Bottomley2005-04-221-2/+2
| | | | | | | | | | The patch to arch/i386/kernel/cpu/amd.c relies on the variable cpu_core_id which is defined in i386/kernel/smpboot.c. This means it is only present if CONFIG_X86_SMP is defined, not CONFIG_SMP (alternative SMP harnesses won't have it, which is why it breaks voyager). Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix tgafb.c compile failureAdrian Bunk2005-04-211-3/+1Star
| | | | | | | The untested patch below should fix this compile error. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix non-legacy ISO receive regressionJody McIntyre2005-04-211-20/+43
| | | | | | | | | | | Fix non-legacy multichannel ISO receive, broken by Parag Wardukar's allocation fix. Multichannel ISO receive still sucks; it should be possible to use both legacy and non-legacy modes at the same time, but with this patch, things are no worse than they were in 2.6.11 and allocation is still done at the correct time. Signed-off-by: Jody McIntyre <scjody@steamballoon.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] ohci1394: tlabels misprinted in DBGMSGJody McIntyre2005-04-211-3/+3
| | | | | | | | | | - Print the correct value in the DBGMSG in dma_rcv_tasklet(). See OHCI 1.1 section 8.7, page 103 ff. - Print tlabels as %d everywhere. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jody McIntyre <scjody@steamballoon.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.gitLinus Torvalds2005-04-212-7/+24
|\
| * [IA64] fix fls()David Mosberger-Tang2005-04-212-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ia64-version of fls() never worked as intended (the bitnumbering was off by 1 and fls(0) was undefined). This patch fixes the problem by using a popcnt-based fls(), which on McKinley-derived cores is slightly faster than both ia64_fls() and generic_fls(). The resulting code, however, is bigger (7-8 bundles instead of about 3 bundles). Also switch ia64_popcnt() to __builtin_popcountl() for GCC v3.4 or newer since the compiler can predicate that and schedule it better. Thanks to Simon Derr and Matt Mackall for tracking down this bug. Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
* | [PATCH] alpha: key management syscallsRichard Henderson2005-04-212-1/+7
|/ | | | | Allocate syscall numbers for add_key, request_key, keyctl.
* [PATCH] fix for ISDN ippp filteringKarsten Keil2005-04-211-5/+5
| | | | | | | | | We do not longer use DLT_LINUX_SLL for activ/pass filters but DLT_PPP_WITHDIRECTION witch need 1 as outbound flag. Signed-off-by: Karsten Keil <kkeil@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Bug in new out of line put_user()Alexander Nyberg2005-04-212-11/+20
| | | | | | | | | | | | | | The new out of line put_user() assembly on x86_64 changes %rcx without telling GCC about it causing things like: http://bugme.osdl.org/show_bug.cgi?id=4515 See to it that %rcx is not changed (made it consistent with get_user()). Signed-off-by: Alexander Nyberg <alexn@telia.com> Signed-off-by: ak@suse.de Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge rsync://rsync.kernel.org/pub/linux/kernel/people/davem/sparc-2.6.gitLinus Torvalds2005-04-211-17/+31
|\
| * [SPARC64]: sparc64 preempt + smpAl Viro2005-04-211-17/+31
| | | | | | | | | | | | | | PREEMPT+SMP support - see if it looks sane... Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* | [PATCH] Fix aic7xxx_osm.c compile with older gcc'sJames Bottomley2005-04-211-3/+2Star
| | | | | | | | | | | | | | | | | | My version of gcc doesn't warn about this error (declaration in the middle of a set of statements). The fix is simple (this also corrects return code; for init functions it should be zero or error).
* | Linux v2.6.12-rc3Linus Torvalds2005-04-211-1/+1
|/ | | | | Releasing this will also make "git" the official source control thing. Here's to hoping for the best.
* [IPSEC]: COW skb header in UDP decapHerbert Xu2005-04-201-0/+2
| | | | | | | | The following patch just makes the header part of the skb writeable. This is needed since we modify the IP headers just a few lines below. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* [ATALK]: Add missing dev_hold() to atrtr_create().Herbert Xu2005-04-201-0/+1
| | | | | Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>