diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /arch/arm/mach-footbridge/cats-hw.c | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-footbridge/cats-hw.c')
| -rw-r--r-- | arch/arm/mach-footbridge/cats-hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c index 5b64d5c5b96..ef6ccc8993e 100644 --- a/arch/arm/mach-footbridge/cats-hw.c +++ b/arch/arm/mach-footbridge/cats-hw.c @@ -8,7 +8,7 @@ #include <linux/ioport.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/tty.h> +#include <linux/screen_info.h> #include <asm/hardware/dec21285.h> #include <asm/io.h> |