diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:43:41 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 18:43:41 +0200 |
commit | 85e9ca333d03fbd56b9e123c8456f0d98e20faad (patch) | |
tree | 7bb15ada5f536950efa23ad60ea9eea60380ca1c /drivers/mtd/maps/ts5500_flash.c | |
parent | documentation: move hpet.txt to timers/ subdirectory (diff) | |
parent | Linux 2.6.27-rc1 (diff) | |
download | linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.tar.xz linux-85e9ca333d03fbd56b9e123c8456f0d98e20faad.zip |
Merge branch 'linus' into timers/hpet
Diffstat (limited to 'drivers/mtd/maps/ts5500_flash.c')
-rw-r--r-- | drivers/mtd/maps/ts5500_flash.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mtd/maps/ts5500_flash.c b/drivers/mtd/maps/ts5500_flash.c index b47270e850bc..e2147bf11c88 100644 --- a/drivers/mtd/maps/ts5500_flash.c +++ b/drivers/mtd/maps/ts5500_flash.c @@ -22,8 +22,6 @@ * - Drive A and B use the resident flash disk (RFD) flash translation layer. * - If you have created your own jffs file system and the bios overwrites * it during boot, try disabling Drive A: and B: in the boot order. - * - * $Id: ts5500_flash.c,v 1.5 2005/11/07 11:14:28 gleixner Exp $ */ #include <linux/init.h> |