diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 18:15:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 18:15:43 +1100 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /drivers/char | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/s3c2410-rtc.c | 2 | ||||
| -rw-r--r-- | drivers/char/sonypi.c | 1 | ||||
| -rw-r--r-- | drivers/char/tb0219.c | 2 | ||||
| -rw-r--r-- | drivers/char/vr41xx_giu.c | 2 | ||||
| -rw-r--r-- | drivers/char/vr41xx_rtc.c | 2 | ||||
| -rw-r--r-- | drivers/char/watchdog/mpcore_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/char/watchdog/mv64x60_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/char/watchdog/s3c2410_wdt.c | 2 |
8 files changed, 9 insertions, 6 deletions
diff --git a/drivers/char/s3c2410-rtc.c b/drivers/char/s3c2410-rtc.c index 887b8b2d7882..d724c0de4f28 100644 --- a/drivers/char/s3c2410-rtc.c +++ b/drivers/char/s3c2410-rtc.c @@ -20,7 +20,7 @@ #include <linux/fs.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/rtc.h> #include <linux/bcd.h> diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index f86c15587238..d05067dcea01 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -48,6 +48,7 @@ #include <linux/dmi.h> #include <linux/err.h> #include <linux/kfifo.h> +#include <linux/platform_device.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/drivers/char/tb0219.c b/drivers/char/tb0219.c index eb7058cbf015..24355b23b2ca 100644 --- a/drivers/char/tb0219.c +++ b/drivers/char/tb0219.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/fs.h> #include <linux/init.h> #include <linux/module.h> diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c index 683278bc5241..94641085faf8 100644 --- a/drivers/char/vr41xx_giu.c +++ b/drivers/char/vr41xx_giu.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/errno.h> #include <linux/fs.h> #include <linux/init.h> diff --git a/drivers/char/vr41xx_rtc.c b/drivers/char/vr41xx_rtc.c index a6dbe4da030c..5e3292df69d8 100644 --- a/drivers/char/vr41xx_rtc.c +++ b/drivers/char/vr41xx_rtc.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/fs.h> #include <linux/init.h> #include <linux/ioport.h> diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index 75ca84ed4adf..47a5f6ab4879 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c @@ -29,7 +29,7 @@ #include <linux/reboot.h> #include <linux/init.h> #include <linux/interrupt.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <asm/hardware/arm_twd.h> #include <asm/uaccess.h> diff --git a/drivers/char/watchdog/mv64x60_wdt.c b/drivers/char/watchdog/mv64x60_wdt.c index 6d3ff0836c44..04e0d7e9680d 100644 --- a/drivers/char/watchdog/mv64x60_wdt.c +++ b/drivers/char/watchdog/mv64x60_wdt.c @@ -22,6 +22,8 @@ #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/watchdog.h> +#include <linux/platform_device.h> + #include <asm/mv64x60.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c index b732020acadb..e7e20a6d64b0 100644 --- a/drivers/char/watchdog/s3c2410_wdt.c +++ b/drivers/char/watchdog/s3c2410_wdt.c @@ -44,7 +44,7 @@ #include <linux/watchdog.h> #include <linux/fs.h> #include <linux/init.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/interrupt.h> #include <asm/uaccess.h> |