diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 15:51:32 +0000 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/misc | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_cpustate.c | 2 | ||||
| -rw-r--r-- | drivers/misc/hdpuftrs/hdpu_nexus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c index 46de5c94055..9c4dd682ac7 100644 --- a/drivers/misc/hdpuftrs/hdpu_cpustate.c +++ b/drivers/misc/hdpuftrs/hdpu_cpustate.c @@ -21,7 +21,7 @@ #include <linux/miscdevice.h> #include <linux/pci.h> #include <linux/proc_fs.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <asm/uaccess.h> #include <linux/hdpu_features.h> diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c index c203b27269e..165f3405df2 100644 --- a/drivers/misc/hdpuftrs/hdpu_nexus.c +++ b/drivers/misc/hdpuftrs/hdpu_nexus.c @@ -21,7 +21,7 @@ #include <linux/hdpu_features.h> #include <linux/pci.h> -#include <linux/device.h> +#include <linux/platform_device.h> static int hdpu_nexus_probe(struct device *ddev); static int hdpu_nexus_remove(struct device *ddev); |