diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/powerpc/boot/simpleboot.c | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/powerpc/boot/simpleboot.c')
| -rw-r--r-- | arch/powerpc/boot/simpleboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c index c58a0dada992..21cd48074ec8 100644 --- a/arch/powerpc/boot/simpleboot.c +++ b/arch/powerpc/boot/simpleboot.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include "types.h" | 19 | #include "types.h" |
| 20 | #include "io.h" | 20 | #include "io.h" |
| 21 | #include "stdio.h" | 21 | #include "stdio.h" |
| 22 | #include "libfdt/libfdt.h" | 22 | #include <libfdt.h> |
| 23 | 23 | ||
| 24 | BSS_STACK(4*1024); | 24 | BSS_STACK(4*1024); |
| 25 | 25 | ||