diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /arch/arm/common/sa1111.c | |
| parent | 68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff) | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/common/sa1111.c')
| -rw-r--r-- | arch/arm/common/sa1111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 7b07acb03f3b..39a6eea300a2 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -1266,7 +1266,7 @@ static void __exit sa1111_exit(void) | |||
| 1266 | bus_unregister(&sa1111_bus_type); | 1266 | bus_unregister(&sa1111_bus_type); |
| 1267 | } | 1267 | } |
| 1268 | 1268 | ||
| 1269 | module_init(sa1111_init); | 1269 | subsys_initcall(sa1111_init); |
| 1270 | module_exit(sa1111_exit); | 1270 | module_exit(sa1111_exit); |
| 1271 | 1271 | ||
| 1272 | MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); | 1272 | MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); |