Merge tag 'v3.10.41' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / gator / gator_events_scorpion.c

diff --git a/drivers/gator/gator_events_scorpion.c b/drivers/gator/gator_events_scorpion.c
index aaf306a4b4c8c5cbc2b15d6ae13e6d240b50c087..8ca251af0e2672e4216f19b085d4b1f7cf3b3102 100644 (file)
--- a/drivers/gator/gator_events_scorpion.c
+++ b/drivers/gator/gator_events_scorpion.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2011-2013. All rights reserved.
+ * Copyright (C) ARM Limited 2011-2014. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -666,11 +666,4 @@ int gator_events_scorpion_init(void)
        return gator_events_install(&gator_events_scorpion_interface);
 }
 
-gator_events_init(gator_events_scorpion_init);
-
-#else
-int gator_events_scorpion_init(void)
-{
-       return -1;
-}
 #endif