0f48285755
The missing definitions are now in.
This reverts commit 23886839a7.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>