aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-12-08 10:57:27 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:27 +0000
commit35123c4561b9e35a266da70add75927782df0f6b (patch)
tree20dc837cf0e33df11a9291de6e0eedc0252970c6
parentf448a317fe64526e5d8cfbd0c9ccba95ca6cf473 (diff)
downloadmrst-s0i3-test-35123c4561b9e35a266da70add75927782df0f6b.tar.gz
mrst-s0i3-test-35123c4561b9e35a266da70add75927782df0f6b.tar.xz
mrst-s0i3-test-35123c4561b9e35a266da70add75927782df0f6b.zip
sep: Compile/merge fixups
Signed-off-by: Alan Cox <alan@linux.intel.com>
-rw-r--r--drivers/staging/sep/sep_driver.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index a18bcb833e8..bf9f2a7db93 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -66,7 +66,7 @@
#endif
#if defined(CONFIG_RAR_REGISTER)
-#include "../rar_register/rar_register.h"
+#include <linux/rar_register.h>
#else
#include "rar_register_stub.h"
#endif
@@ -4002,19 +4002,15 @@ static int __devinit sep_probe(struct pci_dev *pdev,
/* the next section depends on type of unit */
if (sep->mrst) {
-
error = register_rar(RAR_TYPE_IMAGE, &sep_callback,
- (unsigned long)sejjp);
+ (unsigned long)sep);
if (error) {
dev_dbg(&sep->pdev->dev,
"error register_rar\n");
goto end_function_deallocate_sep_shared_area;
}
- }
-
- else {
-
- sep->rar_size = FAKE_RAR_SIZE;
+ } else {
+ sep->rar_size = FAKE_RAR_SIZE;
sep->rar_addr = dma_alloc_coherent(NULL,
sep->rar_size, &sep->rar_bus, GFP_KERNEL);
if (sep->rar_addr == NULL) {