diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 22:11:34 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-07-15 22:11:34 -0400 |
| commit | 8c11642a50555e584774737f7c296f9aece310cf (patch) | |
| tree | 1ff8dfaf05479593ef2c50378a68dfc6aec495a5 /drivers/misc/ioc4.c | |
| parent | 5d10302f46df1d9a85c34ea97f9b6c29e414482e (diff) | |
| parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) | |
Merge commit 'v3.0-rc7' into devicetree/next
Diffstat (limited to 'drivers/misc/ioc4.c')
| -rw-r--r-- | drivers/misc/ioc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c index 668d41e594a9..df03dd3bd0e2 100644 --- a/drivers/misc/ioc4.c +++ b/drivers/misc/ioc4.c | |||
| @@ -270,7 +270,7 @@ ioc4_variant(struct ioc4_driver_data *idd) | |||
| 270 | return IOC4_VARIANT_PCI_RT; | 270 | return IOC4_VARIANT_PCI_RT; |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | static void __devinit | 273 | static void |
| 274 | ioc4_load_modules(struct work_struct *work) | 274 | ioc4_load_modules(struct work_struct *work) |
| 275 | { | 275 | { |
| 276 | request_module("sgiioc4"); | 276 | request_module("sgiioc4"); |