diff options
| author | Christoph Hellwig <hch@lst.de> | 2005-06-23 00:10:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:33 -0700 |
| commit | 9a59f452abe11f569e13ec16c51e6d61c54b9838 (patch) | |
| tree | 0fc242afbf51aac7214e3a9b7620e83d0d4016f2 /arch/ppc/boot/simple | |
| parent | f9fd27a253d5e0b23531d12ce7ad15b6535d4486 (diff) | |
| download | op-kernel-dev-9a59f452abe11f569e13ec16c51e6d61c54b9838.zip op-kernel-dev-9a59f452abe11f569e13ec16c51e6d61c54b9838.tar.gz | |
[PATCH] remove <linux/xattr_acl.h>
This file duplicates <linux/posix_acl_xattr.h>, using slightly different
names.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/boot/simple')
| -rw-r--r-- | arch/ppc/boot/simple/misc.c | 2 | ||||
| -rw-r--r-- | arch/ppc/boot/simple/mpc10x_memory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c index ab0f990..e02de5b 100644 --- a/arch/ppc/boot/simple/misc.c +++ b/arch/ppc/boot/simple/misc.c @@ -222,7 +222,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum) puts("\n"); puts("Uncompressing Linux..."); - gunzip(0x0, 0x400000, zimage_start, &zimage_size); + gunzip(NULL, 0x400000, zimage_start, &zimage_size); puts("done.\n"); /* get the bi_rec address */ diff --git a/arch/ppc/boot/simple/mpc10x_memory.c b/arch/ppc/boot/simple/mpc10x_memory.c index 977daed..20d92a3 100644 --- a/arch/ppc/boot/simple/mpc10x_memory.c +++ b/arch/ppc/boot/simple/mpc10x_memory.c @@ -33,7 +33,7 @@ #define MPC10X_PCI_OP(rw, size, type, op, mask) \ static void \ -mpc10x_##rw##_config_##size(unsigned int *cfg_addr, \ +mpc10x_##rw##_config_##size(unsigned int __iomem *cfg_addr, \ unsigned int *cfg_data, int devfn, int offset, \ type val) \ { \ |
