summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2004-11-06 16:41:24 +0000
committerJon Smirl <jonsmirl@yahoo.com>2004-11-06 16:41:24 +0000
commit000c8eb18ef7ee9cecb34909be52281ec88a5486 (patch)
tree17a18477e3859a14422d4376b2050c143d03c240
parentb2f275b46e575766c7b5dab22ba30a367a182c9e (diff)
Fix Linux build. Why won't this complile? extern int const foo; static
struct drm_driver driver = { .var = foo }; error says foo is not constant
-rw-r--r--linux-core/r128_drv.c5
-rw-r--r--linux-core/radeon_drv.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 73be2027..160cc865 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -88,8 +88,7 @@ static struct drm_driver driver = {
.get_reg_ofs = drm_core_get_reg_ofs,
.postinit = postinit,
.version = version,
- .ioctls = ioctls,
- .num_ioctls = DRM_ARRAY_SIZE(ioctls),
+ .ioctls = r128_ioctls,
.dma_ioctl = r128_cce_buffers,
.fops = {
.owner = THIS_MODULE,
@@ -116,6 +115,8 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static int __init r128_init(void)
{
+ driver.num_ioctls = r128_max_ioctl;
+
return drm_init(&driver, pciidlist);
}
diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c
index 4de3d80d..a33cbcf1 100644
--- a/linux-core/radeon_drv.c
+++ b/linux-core/radeon_drv.c
@@ -94,7 +94,6 @@ static struct drm_driver driver = {
.postinit = postinit,
.version = version,
.ioctls = radeon_ioctls,
- .num_ioctls = DRM_ARRAY_SIZE(radeon_ioctls),
.dma_ioctl = radeon_cp_buffers,
.fops = {
.owner = THIS_MODULE,
@@ -120,6 +119,7 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
static int __init radeon_init(void)
{
+ driver.num_ioctls = radeon_max_ioctl;
return drm_init(&driver, pciidlist);
}