diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:53:34 -0400 |
| commit | acc696d93dcf993dec123d69d599979e1456ffec (patch) | |
| tree | b860b80bb96bb5e3ea1f0347b92fbb1e8b15af36 /drivers/char/snsc.c | |
| parent | bf2af2a2027e52b653882fbca840620e896ae081 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/char/snsc.c')
| -rw-r--r-- | drivers/char/snsc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c index b543821d8cb4..56c8243cdb73 100644 --- a/drivers/char/snsc.c +++ b/drivers/char/snsc.c | |||
| @@ -390,7 +390,8 @@ scdrv_init(void) | |||
| 390 | format_module_id(devnamep, geo_module(geoid), | 390 | format_module_id(devnamep, geo_module(geoid), |
| 391 | MODULE_FORMAT_BRIEF); | 391 | MODULE_FORMAT_BRIEF); |
| 392 | devnamep = devname + strlen(devname); | 392 | devnamep = devname + strlen(devname); |
| 393 | sprintf(devnamep, "#%d", geo_slab(geoid)); | 393 | sprintf(devnamep, "^%d#%d", geo_slot(geoid), |
| 394 | geo_slab(geoid)); | ||
| 394 | 395 | ||
| 395 | /* allocate sysctl device data */ | 396 | /* allocate sysctl device data */ |
| 396 | scd = kzalloc(sizeof (struct sysctl_data_s), | 397 | scd = kzalloc(sizeof (struct sysctl_data_s), |