Merge branches 'fixes' and 'mmci' into for-linus

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / drivers / ps3 / ps3-sys-manager.c

diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index 1b98367110c49132ef1d98999fd795f1873a9aba..f2ab435954f6b98d67bbede2b8e4b854b92ff5e4 100644 (file)
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -706,7 +706,7 @@ static void ps3_sys_manager_work(struct ps3_system_bus_device *dev)
        ps3_vuart_read_async(dev, PS3_SM_RX_MSG_LEN_MIN);
 }
 
-static int __devinit ps3_sys_manager_probe(struct ps3_system_bus_device *dev)
+static int ps3_sys_manager_probe(struct ps3_system_bus_device *dev)
 {
        int result;
        struct ps3_sys_manager_ops ops;