diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /arch/powerpc/boot/cuboot-warp.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'arch/powerpc/boot/cuboot-warp.c')
| -rw-r--r-- | arch/powerpc/boot/cuboot-warp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c index bdedebe1bc14..3db93e85e9ea 100644 --- a/arch/powerpc/boot/cuboot-warp.c +++ b/arch/powerpc/boot/cuboot-warp.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "4xx.h" | 11 | #include "4xx.h" |
| 12 | #include "cuboot.h" | 12 | #include "cuboot.h" |
| 13 | 13 | ||
| 14 | #define TARGET_4xx | ||
| 14 | #define TARGET_44x | 15 | #define TARGET_44x |
| 15 | #include "ppcboot.h" | 16 | #include "ppcboot.h" |
| 16 | 17 | ||