diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-05-20 00:43:00 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-05-20 00:43:00 -0600 |
| commit | 78fab4c04c76b8c9327541bd270f82b85b42bbf7 (patch) | |
| tree | b43006348a1ac15c28e6791d08646809761a2a4a /arch/sparc/kernel/ds.c | |
| parent | 3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 (diff) | |
| parent | 61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf (diff) | |
| download | linux-78fab4c04c76b8c9327541bd270f82b85b42bbf7.tar.bz2 | |
Merge commit 'v2.6.39' into spi/next
Diffstat (limited to 'arch/sparc/kernel/ds.c')
| -rw-r--r-- | arch/sparc/kernel/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c index 4a700f4b79ce..3add4de8a1a9 100644 --- a/arch/sparc/kernel/ds.c +++ b/arch/sparc/kernel/ds.c @@ -1218,7 +1218,7 @@ static int ds_remove(struct vio_dev *vdev) return 0; } -static struct vio_device_id __initdata ds_match[] = { +static const struct vio_device_id ds_match[] = { { .type = "domain-services-port", }, |