diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 20:38:55 +0100 |
| commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
| tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /arch/arm/mach-sa1100/badge4.c | |
| parent | Merge branch 'master' (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6 (diff) | |
| download | linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.xz linux-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index c92cebff7f8e..edccd5eb06be 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c @@ -16,7 +16,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/delay.h> #include <linux/tty.h> #include <linux/mtd/mtd.h> |