diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-05 01:57:04 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-10-08 21:08:14 +0200 |
commit | 22465583e62fadb0fe019b641c86b13c7510601a (patch) | |
tree | f020b63889f842f83dc3000a4430dab46c866fb5 /conf | |
parent | c26aa8ee7d41543a8e38994a1c584da8eb478512 (diff) | |
download | meta-ti-22465583e62fadb0fe019b641c86b13c7510601a.tar.gz |
linux 3.0: rebase from 3.0.4 to 3.0.6
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/omap3.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index f6b67bb4..9c7e62ea 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc | |||
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3" | |||
3 | require conf/machine/include/tune-cortexa8.inc | 3 | require conf/machine/include/tune-cortexa8.inc |
4 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" | 4 | PREFERRED_PROVIDER_virtual/kernel = "linux-omap" |
5 | # Increase this everytime you change something in the kernel | 5 | # Increase this everytime you change something in the kernel |
6 | MACHINE_KERNEL_PR = "r105" | 6 | MACHINE_KERNEL_PR = "r106" |
7 | 7 | ||
8 | KERNEL_IMAGETYPE = "uImage" | 8 | KERNEL_IMAGETYPE = "uImage" |
9 | 9 | ||