diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:48 +0200 |
| commit | d1e65d2a7bd9162e7009da870adb15c70b620320 (patch) | |
| tree | 8eb7152b40e2f5868984f5f36cdfa142db53937c /drivers/video | |
| parent | cd323c02240af01eb914c87d9d7c41db6e34984b (diff) | |
| parent | 77322aa896895f4f68501a071086e432e575dcc2 (diff) | |
| download | barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.gz barebox-d1e65d2a7bd9162e7009da870adb15c70b620320.tar.xz | |
Merge branch 'for-next/remove-fsf-address'
Conflicts:
drivers/net/miidev.c
include/miidev.h
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/imx-ipu-fb.c | 4 | ||||
| -rw-r--r-- | drivers/video/pxa.c | 5 | ||||
| -rw-r--r-- | drivers/video/s3c24xx.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/drivers/video/imx-ipu-fb.c b/drivers/video/imx-ipu-fb.c index 8039de0f9a..80236b3f23 100644 --- a/drivers/video/imx-ipu-fb.c +++ b/drivers/video/imx-ipu-fb.c @@ -15,10 +15,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA */ #include <common.h> diff --git a/drivers/video/pxa.c b/drivers/video/pxa.c index 900ae80165..f06a3945fa 100644 --- a/drivers/video/pxa.c +++ b/drivers/video/pxa.c @@ -11,11 +11,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - * * Derived from the linux-2.6 pxa framebuffer driver: * * Copyright (C) 1999 Eric A. Thomas. diff --git a/drivers/video/s3c24xx.c b/drivers/video/s3c24xx.c index 5d5d8f6d8d..4925ca8461 100644 --- a/drivers/video/s3c24xx.c +++ b/drivers/video/s3c24xx.c @@ -16,10 +16,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA * */ |