diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/media/radio | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/media/radio')
| -rw-r--r-- | drivers/media/radio/miropcm20-rds.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c index 87b37b7691da..c1b1db65e668 100644 --- a/drivers/media/radio/miropcm20-rds.c +++ b/drivers/media/radio/miropcm20-rds.c | |||
| @@ -115,7 +115,6 @@ static struct file_operations rds_fops = { | |||
| 115 | static struct miscdevice rds_miscdev = { | 115 | static struct miscdevice rds_miscdev = { |
| 116 | .minor = MISC_DYNAMIC_MINOR, | 116 | .minor = MISC_DYNAMIC_MINOR, |
| 117 | .name = "radiotext", | 117 | .name = "radiotext", |
| 118 | .devfs_name = "v4l/rds/radiotext", | ||
| 119 | .fops = &rds_fops, | 118 | .fops = &rds_fops, |
| 120 | }; | 119 | }; |
| 121 | 120 | ||