aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r--sound/pci/oxygen/oxygen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 2becae155a48..ada6c256378e 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -756,8 +756,8 @@ static const struct oxygen_model model_generic = {
756 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 756 .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
757}; 757};
758 758
759static int __devinit get_oxygen_model(struct oxygen *chip, 759static int get_oxygen_model(struct oxygen *chip,
760 const struct pci_device_id *id) 760 const struct pci_device_id *id)
761{ 761{
762 static const char *const names[] = { 762 static const char *const names[] = {
763 [MODEL_MERIDIAN] = "AuzenTech X-Meridian", 763 [MODEL_MERIDIAN] = "AuzenTech X-Meridian",
@@ -848,8 +848,8 @@ static int __devinit get_oxygen_model(struct oxygen *chip,
848 return 0; 848 return 0;
849} 849}
850 850
851static int __devinit generic_oxygen_probe(struct pci_dev *pci, 851static int generic_oxygen_probe(struct pci_dev *pci,
852 const struct pci_device_id *pci_id) 852 const struct pci_device_id *pci_id)
853{ 853{
854 static int dev; 854 static int dev;
855 int err; 855 int err;
@@ -871,7 +871,7 @@ static struct pci_driver oxygen_driver = {
871 .name = KBUILD_MODNAME, 871 .name = KBUILD_MODNAME,
872 .id_table = oxygen_ids, 872 .id_table = oxygen_ids,
873 .probe = generic_oxygen_probe, 873 .probe = generic_oxygen_probe,
874 .remove = __devexit_p(oxygen_pci_remove), 874 .remove = oxygen_pci_remove,
875#ifdef CONFIG_PM_SLEEP 875#ifdef CONFIG_PM_SLEEP
876 .driver = { 876 .driver = {
877 .pm = &oxygen_pci_pm, 877 .pm = &oxygen_pci_pm,