diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:31:20 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:31:20 +0000 |
commit | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch) | |
tree | 7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /arch/arm/mach-s3c2410/usb-simtec.c | |
parent | 0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff) | |
parent | ccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff) |
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
-rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 50e25fc5f8a..6b9d0d83a6f 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c @@ -1,6 +1,6 @@ /* linux/arch/arm/mach-s3c2410/usb-simtec.c * - * Copyright (c) 2004,2005 Simtec Electronics + * Copyright 2004-2005 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> * * http://www.simtec.co.uk/products/EB2410ITX/ @@ -108,7 +108,7 @@ int usb_simtec_init(void) { int ret; - printk("USB Power Control, (c) 2004 Simtec Electronics\n"); + printk("USB Power Control, Copyright 2004 Simtec Electronics\n"); ret = gpio_request(S3C2410_GPB(4), "USB power control"); if (ret < 0) { |