diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-29 01:22:18 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-29 01:22:18 +0100 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /drivers/net/sis900.c | |
| parent | drm/radeon: fix logic in r600_page_table_init() to match ati_gart (diff) | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| download | linux-90f959bcb386da2c71613dcefc6a285e054a539e.tar.xz linux-90f959bcb386da2c71613dcefc6a285e054a539e.zip | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
Diffstat (limited to 'drivers/net/sis900.c')
| -rw-r--r-- | drivers/net/sis900.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index be4465bc0a69..8a70de72ea2c 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -80,8 +80,8 @@ #define SIS900_MODULE_NAME "sis900" #define SIS900_DRV_VERSION "v1.08.10 Apr. 2 2006" -static char version[] __devinitdata = -KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n"; +static const char version[] __devinitconst = + KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n"; static int max_interrupt_work = 40; static int multicast_filter_limit = 128; |