Robert P. J. Day
5379397182
drm: remove via_mm.h
...
Delete apparently unused header file drivers/char/drm/via_mm.h.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:08:10 +11:00
Dave Airlie
c1185ccdfb
drm: add missing NULL assignment
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Michel Dänzer
80b2c386f3
drm/radeon: Fix u32 overflows when determining AGP base address in card space.
...
The overflows could lead to the AGP aperture overlapping the framebuffer are in the card's address space when the latter is located at the very end of th 32 bit address space, which would result in a freeze on X server startup,
probably because the card read commands from the framebuffer instead of from AGP.
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=392915 .
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Dave Airlie
cd839d0048
drm: port over use_vmalloc code from git hashtab
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Dave Airlie
11d9c2fd0a
drm: fix crash with fops lock and fixup sarea/page size locking
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Dave Airlie
54ba2f76e2
drm: bring bufs code from git tree.
...
This checks the AGP mappings are in a valid place and also fixes the size
check in the vm..
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Dave Airlie
5cc7f9abec
drm: move protection stuff into separate function
...
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:17 +11:00
Ahmed S. Darwish
8311d570bc
drm: Use ARRAY_SIZE macro when appropriate
...
Use ARRAY_SIZE macro already defined in kernel.h
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:16 +11:00
Randy Dunlap
f54d1e40b2
drm: update README.drm (bugzilla #7933 )
...
Update URLs in drivers/char/drm/README.drm, to take care of kernel bugzilla
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:16 +11:00
Adrian Bunk
41ed5de971
drm: remove unused exports
...
This patch removes two unused exports.
Signed-off-by: Adrian Bunk <bunk@stusta.de >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Dave Airlie <airlied@linux.ie >
2007-03-11 12:07:16 +11:00
Linus Torvalds
be521466fe
Revert "USB: pxa2xx_udc: fix hardcoded irq number"
...
This reverts commit d2487cb425 .
Russell King points out that it's obviously bogus, and I have to agree.
Not only does "irq" not even exist in that scope, but we obviously need
to free the irq that we actually requested, and that's IRQ_USB.
Reported-by: Russell King <rmk@arm.linux.org.uk >
Cc: Andrew Morton <akpm@linux-foundation.org >
Cc: Greg KH <greg@kroah.com >
Cc: David Brownell <david-b@pacbell.net >,
Cc: Milan Svoboda <msvoboda@ra.rockwell.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-03-10 14:22:07 -08:00
Linus Torvalds
f47273e5c8
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV6] fix ipv6_getsockopt_sticky copy_to_user leak
[IPV6]: Fix for ipv6_setsockopt NULL dereference
[DCCP]: Initialise write_xmit_timer also on passive sockets
[IPV4]: Fix rtm_to_ifaddr() error handling.
2007-03-09 22:04:27 -08:00
Linus Torvalds
f4cd87aabb
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
...
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] refresh config files
[IA64] put kdump_find_rsvd_region in __init
[IA64] Remove sparse warning from unwind code
[IA64] add missing syscall trace clear
[IA64] Cleanup in crash.c
[IA64] kexec: declare ia64_mca_pal_base in mca.h rather than kexec.h
[IA64] pci_get_legacy_ide_irq should return irq (not GSI)
[IA64] whitespace fixes for include/asm-ia64/sal.h
[IA64] Cache error recovery
[IA64] Proper handling of TLB errors from duplicate itr.d dropins
2007-03-09 22:00:51 -08:00
Linus Torvalds
271368b69b
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
kobject: new_device->kref wasn't putted after error in kobject_move()
driver core: export device_rename
Remove devfs from MAINTAINERS
Driver core: add device symlink back to sysfs
Revert "driver core: refcounting fix"
2007-03-09 21:58:28 -08:00
Linus Torvalds
117430b1fa
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
pci: fix section mismatch warning
PCI: aer: fix section mismatch warning
pcie: fix section mismatch warning
PCI: allow multiple calls to pcim_pin_device()
2007-03-09 21:58:10 -08:00
Linus Torvalds
2695cf412f
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (23 commits)
USB Elan FTDI: check for workqueue creation
USB: fix spinlock recursion in cdc-acm.c
USB: fix Unaligned access in EHCI driver
USB: Product ID for FT232RL in ftdi_sio
USBNET: DM9501: Add Corega FEther USB-TXC support.
USB: ipaq.c: Additional devices
USB: further fix for usb-serial
USB: fix usb-serial device naming bug
USB: RTS/DTR signal patch for airprime driver
USB: ftdi_sio: use port_probe / port_remove thereby fixing access to the latency_timer
usb-serial: fix shutdown / device_unregister order
USB: add Additional PIDs in ftdi_sio
USB: add QL355P power supply ids to fdti_sio
USB: New device IDs for cp2101 driver
USB: kill dead code from hub.c
USB: ratelimit debounce error messages
USB: pxa2xx_udc: fix hardcoded irq number
UHCI: fix port resume problem
USB: set the correct interval for interrupt URBs
USB: goku_udc: Remove crude cache coherency code
...
2007-03-09 21:57:46 -08:00
Len Brown
63e34ca93a
Pull misc-for-upstream into release branch
2007-03-09 23:19:50 -05:00
Len Brown
51e7fff1c2
Pull bugzilla-8110 into release branch
2007-03-09 23:19:25 -05:00
Len Brown
bdf3aaf951
Pull bugzilla-8066 into release branch
2007-03-09 23:19:19 -05:00
Len Brown
b2526300ab
Pull bugzilla-7907 into release branch
2007-03-09 23:18:53 -05:00
Len Brown
cb2ebc59ff
Pull bugzilla-7570 into release branch
2007-03-09 23:18:46 -05:00
Len Brown
3dfb737998
Pull bugzilla-6859 into release branch
2007-03-09 23:18:35 -05:00
Len Brown
63be2d9305
Pull bugzilla-6316 into release branch
2007-03-09 23:18:22 -05:00
Len Brown
653351b0b9
Pull bugzilla-5966 into release branch
2007-03-09 23:18:05 -05:00
Len Brown
5cb69bcace
Pull ibm into release branch
2007-03-09 23:17:46 -05:00