aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS7
-rw-r--r--drivers/dma/dw_dmac.c2
-rw-r--r--drivers/dma/dw_dmac_regs.h1
-rw-r--r--include/linux/dw_dmac.h1
4 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b4b9cdec370..8f4413014b2d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5401,6 +5401,13 @@ L: linux-serial@vger.kernel.org
5401S: Maintained 5401S: Maintained
5402F: drivers/tty/serial 5402F: drivers/tty/serial
5403 5403
5404SYNOPSYS DESIGNWARE DMAC DRIVER
5405M: Viresh Kumar <viresh.kumar@st.com>
5406S: Maintained
5407F: include/linux/dw_dmac.h
5408F: drivers/dma/dw_dmac_regs.h
5409F: drivers/dma/dw_dmac.c
5410
5404TIMEKEEPING, NTP 5411TIMEKEEPING, NTP
5405M: John Stultz <johnstul@us.ibm.com> 5412M: John Stultz <johnstul@us.ibm.com>
5406M: Thomas Gleixner <tglx@linutronix.de> 5413M: Thomas Gleixner <tglx@linutronix.de>
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index eec675bf4f95..efd836dfb65a 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -3,6 +3,7 @@
3 * AVR32 systems.) 3 * AVR32 systems.)
4 * 4 *
5 * Copyright (C) 2007-2008 Atmel Corporation 5 * Copyright (C) 2007-2008 Atmel Corporation
6 * Copyright (C) 2010-2011 ST Microelectronics
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as
@@ -1575,3 +1576,4 @@ module_exit(dw_exit);
1575MODULE_LICENSE("GPL v2"); 1576MODULE_LICENSE("GPL v2");
1576MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver"); 1577MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
1577MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>"); 1578MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>");
1579MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index c968597c32ab..c3419518d701 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -2,6 +2,7 @@
2 * Driver for the Synopsys DesignWare AHB DMA Controller 2 * Driver for the Synopsys DesignWare AHB DMA Controller
3 * 3 *
4 * Copyright (C) 2005-2007 Atmel Corporation 4 * Copyright (C) 2005-2007 Atmel Corporation
5 * Copyright (C) 2010-2011 ST Microelectronics
5 * 6 *
6 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 8 * it under the terms of the GNU General Public License version 2 as
diff --git a/include/linux/dw_dmac.h b/include/linux/dw_dmac.h
index 6998d9376ef9..4bfe0a2f7d50 100644
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
@@ -3,6 +3,7 @@
3 * AVR32 systems.) 3 * AVR32 systems.)
4 * 4 *
5 * Copyright (C) 2007 Atmel Corporation 5 * Copyright (C) 2007 Atmel Corporation
6 * Copyright (C) 2010-2011 ST Microelectronics
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as 9 * it under the terms of the GNU General Public License version 2 as