summaryrefslogtreecommitdiffstats
path: root/arch/ppc/boards/pcm030
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:12:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:12:48 +0200
commitd1e65d2a7bd9162e7009da870adb15c70b620320 (patch)
tree8eb7152b40e2f5868984f5f36cdfa142db53937c /arch/ppc/boards/pcm030
parentcd323c02240af01eb914c87d9d7c41db6e34984b (diff)
parent77322aa896895f4f68501a071086e432e575dcc2 (diff)
downloadbarebox-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 'arch/ppc/boards/pcm030')
-rw-r--r--arch/ppc/boards/pcm030/barebox.lds.S4
-rw-r--r--arch/ppc/boards/pcm030/config.h4
-rw-r--r--arch/ppc/boards/pcm030/mt46v32m16-75.h4
-rw-r--r--arch/ppc/boards/pcm030/pcm030.c4
4 files changed, 0 insertions, 16 deletions
diff --git a/arch/ppc/boards/pcm030/barebox.lds.S b/arch/ppc/boards/pcm030/barebox.lds.S
index 7dda039dbb..cc86d82db6 100644
--- a/arch/ppc/boards/pcm030/barebox.lds.S
+++ b/arch/ppc/boards/pcm030/barebox.lds.S
@@ -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 <asm-generic/barebox.lds.h>
diff --git a/arch/ppc/boards/pcm030/config.h b/arch/ppc/boards/pcm030/config.h
index 508e017161..6e74964056 100644
--- a/arch/ppc/boards/pcm030/config.h
+++ b/arch/ppc/boards/pcm030/config.h
@@ -18,10 +18,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
*/
#ifndef __CONFIG_H
diff --git a/arch/ppc/boards/pcm030/mt46v32m16-75.h b/arch/ppc/boards/pcm030/mt46v32m16-75.h
index 4d191f1f91..60ea09eebc 100644
--- a/arch/ppc/boards/pcm030/mt46v32m16-75.h
+++ b/arch/ppc/boards/pcm030/mt46v32m16-75.h
@@ -18,10 +18,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
*/
#define SDRAM_DDR 1 /* is DDR */
diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c
index 89083e91d8..ae7f7f8c96 100644
--- a/arch/ppc/boards/pcm030/pcm030.c
+++ b/arch/ppc/boards/pcm030/pcm030.c
@@ -21,10 +21,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>