Commit 4ce24183 authored by Jeff Garzik's avatar Jeff Garzik

Merge redhat.com:/spare/repo/linux-2.5

into redhat.com:/spare/repo/netdev-2.6/netdev-alloc-6
parents 0b37a919 7d202bd0
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 3 SUBLEVEL = 3
EXTRAVERSION =-rc4 EXTRAVERSION =
NAME=Feisty Dunnart NAME=Feisty Dunnart
# *DOCUMENTATION* # *DOCUMENTATION*
......
...@@ -2185,10 +2185,21 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) ...@@ -2185,10 +2185,21 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS )
case RADEON_PARAM_STATUS_HANDLE: case RADEON_PARAM_STATUS_HANDLE:
value = dev_priv->ring_rptr_offset; value = dev_priv->ring_rptr_offset;
break; break;
#if BITS_PER_LONG == 32
/*
* This ioctl() doesn't work on 64-bit platforms because hw_lock is a
* pointer which can't fit into an int-sized variable. According to
* Michel Dnzer, the ioctl() is only used on embedded platforms, so
* not supporting it shouldn't be a problem. If the same functionality
* is needed on 64-bit platforms, a new ioctl() would have to be added,
* so backwards-compatibility for the embedded platforms can be
* maintained. --davidm 4-Feb-2004.
*/
case RADEON_PARAM_SAREA_HANDLE: case RADEON_PARAM_SAREA_HANDLE:
/* The lock is the first dword in the sarea. */ /* The lock is the first dword in the sarea. */
value = (int)dev->lock.hw_lock; value = (long)dev->lock.hw_lock;
break; break;
#endif
case RADEON_PARAM_GART_TEX_HANDLE: case RADEON_PARAM_GART_TEX_HANDLE:
value = dev_priv->gart_textures_offset; value = dev_priv->gart_textures_offset;
break; break;
......
...@@ -1041,6 +1041,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) ...@@ -1041,6 +1041,7 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind)
i2c_attach_client(client); i2c_attach_client(client);
if (type < TUNERS) { if (type < TUNERS) {
t->type = type;
printk("tuner: type forced to %d (%s) [insmod]\n", printk("tuner: type forced to %d (%s) [insmod]\n",
t->type,tuners[t->type].name); t->type,tuners[t->type].name);
set_type(client,type); set_type(client,type);
......
...@@ -462,6 +462,7 @@ config FB_I810_GTF ...@@ -462,6 +462,7 @@ config FB_I810_GTF
config FB_MATROX config FB_MATROX
tristate "Matrox acceleration" tristate "Matrox acceleration"
depends on FB && PCI depends on FB && PCI
select I2C_ALGOBIT if FB_MATROX_I2C
---help--- ---help---
Say Y here if you have a Matrox Millennium, Matrox Millennium II, Say Y here if you have a Matrox Millennium, Matrox Millennium II,
Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
...@@ -549,7 +550,6 @@ config FB_MATROX_G100 ...@@ -549,7 +550,6 @@ config FB_MATROX_G100
config FB_MATROX_I2C config FB_MATROX_I2C
tristate "Matrox I2C support" tristate "Matrox I2C support"
depends on FB_MATROX && I2C depends on FB_MATROX && I2C
select I2C_ALGOBIT
---help--- ---help---
This drivers creates I2C buses which are needed for accessing the This drivers creates I2C buses which are needed for accessing the
DDC (I2C) bus present on all Matroxes, an I2C bus which DDC (I2C) bus present on all Matroxes, an I2C bus which
...@@ -627,6 +627,7 @@ config FB_RADEON_OLD ...@@ -627,6 +627,7 @@ config FB_RADEON_OLD
config FB_RADEON config FB_RADEON
tristate "ATI Radeon display support" tristate "ATI Radeon display support"
depends on FB && PCI depends on FB && PCI
select I2C_ALGOBIT if FB_RADEON_I2C
help help
Choose this option if you want to use an ATI Radeon graphics card as Choose this option if you want to use an ATI Radeon graphics card as
a framebuffer device. There are both PCI and AGP versions. You a framebuffer device. There are both PCI and AGP versions. You
...@@ -645,7 +646,6 @@ config FB_RADEON ...@@ -645,7 +646,6 @@ config FB_RADEON
config FB_RADEON_I2C config FB_RADEON_I2C
bool "DDC/I2C for ATI Radeon support" bool "DDC/I2C for ATI Radeon support"
depends on FB_RADEON && I2C depends on FB_RADEON && I2C
select I2C_ALGOBIT
default y default y
help help
Say Y here if you want DDC/I2C support for your Radeon board. Say Y here if you want DDC/I2C support for your Radeon board.
......
...@@ -697,12 +697,7 @@ int blkdev_put(struct block_device *bdev, int kind) ...@@ -697,12 +697,7 @@ int blkdev_put(struct block_device *bdev, int kind)
down(&bdev->bd_sem); down(&bdev->bd_sem);
lock_kernel(); lock_kernel();
if (!--bdev->bd_openers) { if (!--bdev->bd_openers) {
switch (kind) { sync_blockdev(bdev);
case BDEV_FILE:
case BDEV_FS:
sync_blockdev(bdev);
break;
}
kill_bdev(bdev); kill_bdev(bdev);
} }
if (bdev->bd_contains == bdev) { if (bdev->bd_contains == bdev) {
......
...@@ -706,7 +706,7 @@ struct symbol *sym_check_deps(struct symbol *sym) ...@@ -706,7 +706,7 @@ struct symbol *sym_check_deps(struct symbol *sym)
goto out; goto out;
for (prop = sym->prop; prop; prop = prop->next) { for (prop = sym->prop; prop; prop = prop->next) {
if (prop->type == P_CHOICE) if (prop->type == P_CHOICE || prop->type == P_SELECT)
continue; continue;
sym2 = sym_check_expr_deps(prop->visible.expr); sym2 = sym_check_expr_deps(prop->visible.expr);
if (sym2) if (sym2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment