diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:15:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:15:03 -0700 |
| commit | 37a08b13eba6ce3b42df30b2a5ca3a9845f429ec (patch) | |
| tree | 663ceaca23d3ca508994bf9e1e80873a5e091898 /arch/powerpc/platforms/pseries/firmware.c | |
| parent | bd72f85b9ad6cf41bc771de0cd27d892c41b4396 (diff) | |
| parent | b734dd5b5753c88c64bf56d4002d8ade7e88edec (diff) | |
| download | linux-37a08b13eba6ce3b42df30b2a5ca3a9845f429ec.tar.gz linux-37a08b13eba6ce3b42df30b2a5ca3a9845f429ec.tar.bz2 linux-37a08b13eba6ce3b42df30b2a5ca3a9845f429ec.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/pci: Fix MODPOST warning
powerpc/oprofile: Add ppc750 CL as supported by oprofile
powerpc: warning: allocated section `.data_nosave' not in segment
powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'"
powerpc: Fix hypervisor TLB batching
powerpc/mm: Fix hang accessing top of vmalloc space
powerpc: Fix memory leak in axon_msi.c
powerpc/pmac: Fix issues with sleep on some powerbooks
powerpc64/ftrace: use PACA to retrieve TOC in mod_return_to_handler
powerpc/ftrace: show real return addresses in modules
Diffstat (limited to 'arch/powerpc/platforms/pseries/firmware.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/firmware.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c index 5a707da3f5c2..0a14d8cd314f 100644 --- a/arch/powerpc/platforms/pseries/firmware.c +++ b/arch/powerpc/platforms/pseries/firmware.c @@ -51,11 +51,10 @@ firmware_features_table[FIRMWARE_MAX_FEATURES] = { {FW_FEATURE_VIO, "hcall-vio"}, {FW_FEATURE_RDMA, "hcall-rdma"}, {FW_FEATURE_LLAN, "hcall-lLAN"}, - {FW_FEATURE_BULK, "hcall-bulk"}, + {FW_FEATURE_BULK_REMOVE, "hcall-bulk"}, {FW_FEATURE_XDABR, "hcall-xdabr"}, {FW_FEATURE_MULTITCE, "hcall-multi-tce"}, {FW_FEATURE_SPLPAR, "hcall-splpar"}, - {FW_FEATURE_BULK_REMOVE, "hcall-bulk"}, }; /* Build up the firmware features bitmask using the contents of |