Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / sound / pci / oxygen / xonar_pcm179x.c

diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c
index 8433aa7c3d754064f9e0b57cae437277161f09f5..c8c7f2c9b355ae8f4dde5d8deb4b68a11a64f296 100644 (file)
--- a/sound/pci/oxygen/xonar_pcm179x.c
+++ b/sound/pci/oxygen/xonar_pcm179x.c
@@ -1087,8 +1087,8 @@ static const struct oxygen_model model_xonar_st = {
        .adc_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
 };
 
-int __devinit get_xonar_pcm179x_model(struct oxygen *chip,
-                                     const struct pci_device_id *id)
+int get_xonar_pcm179x_model(struct oxygen *chip,
+                           const struct pci_device_id *id)
 {
        switch (id->subdevice) {
        case 0x8269: