Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 329719
b: refs/heads/master
c: da29aa8
h: refs/heads/master
i:
  329717: 1791801
  329715: 506759a
  329711: 7d5810b
v: v3
  • Loading branch information
Seth Jennings authored and Herbert Xu committed Aug 1, 2012
1 parent bd39d15 commit f3811f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 322cacce0a3c36d3ad89d8836b9ed6fcb06e1a61
refs/heads/master: da29aa8f2ab178903a1ac23ce19442f92be4f09c
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/kernel/prom_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@ static void __init early_cmdline_parse(void)
#endif
#define OV5_TYPE1_AFFINITY 0x80 /* Type 1 NUMA affinity */
#define OV5_PFO_HW_RNG 0x80 /* PFO Random Number Generator */
#define OV5_PFO_HW_842 0x40 /* PFO Compression Accelerator */
#define OV5_PFO_HW_ENCR 0x20 /* PFO Encryption Accelerator */

/* Option Vector 6: IBM PAPR hints */
Expand Down Expand Up @@ -774,8 +775,7 @@ static unsigned char ibm_architecture_vec[] = {
0,
0,
0,
OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR,

OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR | OV5_PFO_HW_842,
/* option vector 6: IBM PAPR hints */
4 - 2, /* length */
0,
Expand Down

0 comments on commit f3811f8

Please sign in to comment.