diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/atm/he.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/atm/he.c')
| -rw-r--r-- | drivers/atm/he.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index 449f6298dc89..8557adcd34ee 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -2865,15 +2865,4 @@ static struct pci_driver he_driver = { | |||
| 2865 | .id_table = he_pci_tbl, | 2865 | .id_table = he_pci_tbl, |
| 2866 | }; | 2866 | }; |
| 2867 | 2867 | ||
| 2868 | static int __init he_init(void) | 2868 | module_pci_driver(he_driver); |
| 2869 | { | ||
| 2870 | return pci_register_driver(&he_driver); | ||
| 2871 | } | ||
| 2872 | |||
| 2873 | static void __exit he_cleanup(void) | ||
| 2874 | { | ||
| 2875 | pci_unregister_driver(&he_driver); | ||
| 2876 | } | ||
| 2877 | |||
| 2878 | module_init(he_init); | ||
| 2879 | module_exit(he_cleanup); | ||