diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /arch/ia64 | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index e456f062f241..d00dfc180021 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
| @@ -241,7 +241,7 @@ static void __cpuinit sn_check_for_wars(void) | |||
| 241 | * Note: This stuff is duped here because Altix requires the PCDP to | 241 | * Note: This stuff is duped here because Altix requires the PCDP to |
| 242 | * locate a usable VGA device due to lack of proper ACPI support. Structures | 242 | * locate a usable VGA device due to lack of proper ACPI support. Structures |
| 243 | * could be used from drivers/firmware/pcdp.h, but it was decided that moving | 243 | * could be used from drivers/firmware/pcdp.h, but it was decided that moving |
| 244 | * this file to a more public location just for Altix use was undesireable. | 244 | * this file to a more public location just for Altix use was undesirable. |
| 245 | */ | 245 | */ |
| 246 | 246 | ||
| 247 | struct hcdp_uart_desc { | 247 | struct hcdp_uart_desc { |