← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/prcm-common.h

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, John Rigby
  • Date: 2011-01-08 18:34:41 UTC
  • Revision ID: james.westby@ubuntu.com-20110108183441-002wttt2gz2sah4b
Tags: 2.6.37-1002.5
https://launchpad.net/bugs/697317
[ John Rigby ]

* rebase to new upstreams: 
  v2.6.37 final
  Ubuntu-2.6.37-12.28
* Clean up lintian errors and warnings
  - LP: #697317

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/prcm-common.h
243
243
#define OMAP24XX_EN_GPT1_MASK                           (1 << 0)
244
244
 
245
245
/* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */
246
 
#define OMAP24XX_ST_GPIOS_SHIFT                         (1 << 2)
247
 
#define OMAP24XX_ST_GPIOS_MASK                          2
248
 
#define OMAP24XX_ST_GPT1_SHIFT                          (1 << 0)
249
 
#define OMAP24XX_ST_GPT1_MASK                           0
 
246
#define OMAP24XX_ST_GPIOS_SHIFT                         2
 
247
#define OMAP24XX_ST_GPIOS_MASK                          (1 << 2)
 
248
#define OMAP24XX_ST_GPT1_SHIFT                          0
 
249
#define OMAP24XX_ST_GPT1_MASK                           (1 << 0)
250
250
 
251
251
/* CM_IDLEST_MDM and PM_WKST_MDM shared bits */
252
 
#define OMAP2430_ST_MDM_SHIFT                           (1 << 0)
 
252
#define OMAP2430_ST_MDM_SHIFT                           0
 
253
#define OMAP2430_ST_MDM_MASK                            (1 << 0)
253
254
 
254
255
 
255
256
/* 3430 register bits shared between CM & PRM registers */