HOUSTON, Tex. (WTAQ) - Suspended Packers defensive end Johnny Jolly has agreed to a pre-trial diversion plan, effectively ending his jury trial on drug charges set to begin Tuesday. 

If Jolly meets a set of conditions for one year, the charges would be dropped. He faced up to 20 years in prison after being accused of possessing of over 200 milligrams of codeine in July 2008.