diff options
author | Greg Kroah-Hartman | 2012-06-26 16:04:29 -0700 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-06-26 16:04:29 -0700 |
commit | fc915c8b930c3114f2a838f7e2cd8789ad6fedc3 (patch) | |
tree | 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c /include/linux/pxa2xx_ssp.h | |
parent | fe89def79c48e2149abdd1e816523e69a9067191 (diff) | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) |
Merge 3.5-rc4 into tty-next
This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/pxa2xx_ssp.h')
-rw-r--r-- | include/linux/pxa2xx_ssp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 44835fb39793..f36632061c66 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -160,7 +160,9 @@ enum pxa_ssp_type { PXA25x_SSP, /* pxa 210, 250, 255, 26x */ PXA25x_NSSP, /* pxa 255, 26x (including ASSP) */ PXA27x_SSP, + PXA3xx_SSP, PXA168_SSP, + PXA910_SSP, CE4100_SSP, }; |