Merge branch 'linus' into x86/quirks

[deliverable/linux.git] / arch / sparc / kernel / pmc.c

diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index 814eb3ce039bd8cc69fbcd6a69ea6b01e52e2900..2afcfab4f11cc011585ddc9901b64da953ed9b87 100644 (file)
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -8,7 +8,6 @@
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/miscdevice.h>
 #include <linux/pm.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
@@ -24,7 +23,6 @@
  * #define PMC_NO_IDLE
  */
 
-#define PMC_MINOR      MISC_DYNAMIC_MINOR
 #define PMC_OBPNAME    "SUNW,pmc"
 #define PMC_DEVNAME "pmc"