diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 14:53:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 15:04:19 +0200 |
| commit | d5bbf34613a877dbe3da847fa0432da8c6721e73 (patch) | |
| tree | 902a90fd7eda61aad7abae9c35b0da2e7a786995 /drivers/video/tegra/host/nvhost_intr.h | |
| parent | c6c1f7a2c194f1a2291a15c6691c0d6785f8976e (diff) | |
| parent | 336961dd3cf9c39456dd9657e8f205718740c797 (diff) | |
Merge branch 'l4t/l4t-r16' into colibri
Merge with latest NVIDIA L4T R16.
Only real conflict concerning inverted VBUS gpio support.
Diffstat (limited to 'drivers/video/tegra/host/nvhost_intr.h')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_intr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/nvhost_intr.h b/drivers/video/tegra/host/nvhost_intr.h index 26ab04ebd4ab..cf0b6b9e8934 100644 --- a/drivers/video/tegra/host/nvhost_intr.h +++ b/drivers/video/tegra/host/nvhost_intr.h @@ -71,10 +71,10 @@ struct nvhost_intr { struct nvhost_intr_syncpt *syncpt; struct mutex mutex; int host_general_irq; + int host_syncpt_irq_base; bool host_general_irq_requested; }; #define intr_to_dev(x) container_of(x, struct nvhost_master, intr) -#define intr_op(intr) (intr_to_dev(intr)->op.intr) #define intr_syncpt_to_intr(is) (is->intr) /** |