9 files changed, 26 insertions, 43 deletions

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 724b2ed1a3c..2f173bc0ff0 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -539,6 +539,28 @@ config INTEL_SCU_IPC
           some embedded Intel x86 platforms. This is not needed for PC-type
           machines.
 
+config RAR_REGISTER
+        bool "Restricted Access Region Register Driver"
+        depends on PCI && X86_MRST
+        default n
+        ---help---
+          This driver allows other kernel drivers access to the
+          contents of the restricted access region control registers.
+
+          The restricted access region control registers
+          (rar_registers) are used to pass address and
+          locking information on restricted access regions
+          to other drivers that use restricted access regions.
+
+          The restricted access regions are regions of memory
+          on the Intel MID Platform that are not accessible to
+          the x86 processor, but are accessible to dedicated
+          processors on board peripheral devices.
+
+          The purpose of the restricted access regions is to
+          protect sensitive data from compromise by unauthorized
+          programs running on the x86 processor.
+
 config INTEL_IPS
         tristate "Intel Intelligent Power Sharing"
         depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 7318fc2c162..ed50eca1b55 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -26,4 +26,5 @@ obj-$(CONFIG_TOPSTAR_LAPTOP)	+= topstar-laptop.o
 obj-$(CONFIG_ACPI_TOSHIBA)      += toshiba_acpi.o
 obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o
 obj-$(CONFIG_INTEL_SCU_IPC)     += intel_scu_ipc.o
+obj-$(CONFIG_RAR_REGISTER)      += intel_rar_register.o
 obj-$(CONFIG_INTEL_IPS)         += intel_ips.o
diff --git a/drivers/staging/rar_register/rar_register.c b/drivers/platform/x86/intel_rar_register.c
index 618503f422e..73f8e6d7266 100644
--- a/drivers/staging/rar_register/rar_register.c
+++ b/drivers/platform/x86/intel_rar_register.c
@@ -40,15 +40,12 @@
  *      Initial publish
  */
 
-#define DEBUG 1
-
-#include "rar_register.h"
-
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
+#include <linux/rar_register.h>
 
 /* === Lincroft Message Bus Interface === */
 #define LNC_MCR_OFFSET          0xD0    /* Message Control Register */
@@ -155,7 +152,6 @@ static struct rar_device *_rar_to_device(int rar, int *off)
         return NULL;
 }
 
-
 /**
  *      rar_to_device           -       return the device handling this RAR
  *      @rar: RAR number
@@ -496,7 +492,7 @@ EXPORT_SYMBOL(rar_lock);
  *      a driver that do require a valid RAR address. One of those
  *      steps would be to call rar_get_address()
  *
- *      This function return 0 on success an error code on failure.
+ *      This function return 0 on success or an error code on failure.
  */
 int register_rar(int num, int (*callback)(unsigned long data),
                                                         unsigned long data)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 984a7544071..9dfef8a5997 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -109,8 +109,6 @@ source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"
 
-source "drivers/staging/rar_register/Kconfig"
-
 source "drivers/staging/memrar/Kconfig"
 
 source "drivers/staging/sep/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 9fa25133874..3dbf681ca64 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -35,7 +35,6 @@ obj-$(CONFIG_VT6656)		+= vt6656/
 obj-$(CONFIG_FB_UDL)            += udlfb/
 obj-$(CONFIG_HYPERV)            += hv/
 obj-$(CONFIG_VME_BUS)           += vme/
-obj-$(CONFIG_RAR_REGISTER)      += rar_register/
 obj-$(CONFIG_MRST_RAR_HANDLER)  += memrar/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)               += iio/
diff --git a/drivers/staging/memrar/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c
index efa7fd62d39..41876f2b0e5 100644
--- a/drivers/staging/memrar/memrar_handler.c
+++ b/drivers/staging/memrar/memrar_handler.c
@@ -47,8 +47,7 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
-
-#include "../rar_register/rar_register.h"
+#include <linux/rar_register.h>
 
 #include "memrar.h"
 #include "memrar_allocator.h"
diff --git a/drivers/staging/rar_register/Kconfig b/drivers/staging/rar_register/Kconfig
deleted file mode 100644
index e9c27738199..00000000000
--- a/drivers/staging/rar_register/Kconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# RAR device configuration
-#
-
-menu "RAR Register Driver"
-#
-#       Restricted Access Register Manager
-#
-config RAR_REGISTER
-        tristate "Restricted Access Region Register Driver"
-        depends on PCI
-        default n
-        ---help---
-          This driver allows other kernel drivers access to the
-          contents of the restricted access region control registers.
-
-          The restricted access region control registers
-          (rar_registers) are used to pass address and
-          locking information on restricted access regions
-          to other drivers that use restricted access regions.
-
-          The restricted access regions are regions of memory
-          on the Intel MID Platform that are not accessible to
-          the x86 processor, but are accessible to dedicated
-          processors on board peripheral devices.
-
-          The purpose of the restricted access regions is to
-          protect sensitive data from compromise by unauthorized
-          programs running on the x86 processor.
-endmenu
diff --git a/drivers/staging/rar_register/Makefile b/drivers/staging/rar_register/Makefile
deleted file mode 100644
index d5954ccc16c..00000000000
--- a/drivers/staging/rar_register/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_CFLAGS += -DLITTLE__ENDIAN
-obj-$(CONFIG_RAR_REGISTER) += rar_register.o
diff --git a/drivers/staging/rar_register/rar_register.h b/include/linux/rar_register.h
index ffa805780f8..ffa805780f8 100644
--- a/drivers/staging/rar_register/rar_register.h
+++ b/include/linux/rar_register.h