Merge tag 'v3.19-rc6' into devel
Linux 3.19-rc6
This commit is contained in:
@@ -7,14 +7,14 @@
|
||||
|
||||
#include <dt-bindings/interrupt-controller/irq.h>
|
||||
|
||||
/* interrupt specific cell 0 */
|
||||
/* interrupt specifier cell 0 */
|
||||
|
||||
#define GIC_SPI 0
|
||||
#define GIC_PPI 1
|
||||
|
||||
/*
|
||||
* Interrupt specifier cell 2.
|
||||
* The flaggs in irq.h are valid, plus those below.
|
||||
* The flags in irq.h are valid, plus those below.
|
||||
*/
|
||||
#define GIC_CPU_MASK_RAW(x) ((x) << 8)
|
||||
#define GIC_CPU_MASK_SIMPLE(num) GIC_CPU_MASK_RAW((1 << (num)) - 1)
|
||||
|
@@ -11,7 +11,7 @@
|
||||
#define _DT_BINDINGS_THERMAL_THERMAL_H
|
||||
|
||||
/* On cooling devices upper and lower limits */
|
||||
#define THERMAL_NO_LIMIT (-1UL)
|
||||
#define THERMAL_NO_LIMIT (~0)
|
||||
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user