Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca3b14a authored Oct 04, 2012 by Andi Kleen Committed by Linus Torvalds Oct 06, 2012

sections: fix section conflicts in drivers/atm



Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 75fdd155

drivers/atm/eni.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1567,7 +1567,7 @@ tx_complete++;
		/--------------------------------- entries ---------------------------------/


		static const char *media_name[] __devinitdata = {
		static char * const media_name[] __devinitconst = {
		"MMF", "SMF", "MMF", "03?", /* 0- 3 */
		"UTP", "05?", "06?", "07?", /* 4- 7 */
		"TAXI","09?", "10?", "11?", /* 8-11 */