Author: titmuss
Date: Mon Jun 9 04:31:17 2008
New Revision: 2549
URL: http://svn.slimdevices.com?rev=2549&root=Jive&view=rev
Log:
Bug: 7027
Description:
Remove kernel workaround for pre-production bootloaders.
Modified:
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
Modified:
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c?rev=2549&root=Jive&r1=2548&r2=2549&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
(original)
+++ 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_irtx.c
Mon Jun 9 04:31:17 2008
@@ -1,5 +1,5 @@
//===================================================================
-//IR ¼Û½Å µå¶óÀ̹ö
+//IR ¼Ã½Ã
µå¶óÃùö
//===================================================================
#include <linux/module.h>
@@ -170,14 +170,7 @@
{
int result;
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
result = misc_register (&jive_irtx_miscdev);
Modified:
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c?rev=2549&root=Jive&r1=2548&r2=2549&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
(original)
+++ 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Mon Jun 9 04:31:17 2008
@@ -426,15 +426,7 @@
unsigned long flags;
int rc;
-
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return -ENOENT;;
printk("jive_mgmt_init\n");
Modified:
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c?rev=2549&root=Jive&r1=2548&r2=2549&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
(original)
+++ 7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/drivers/char/jive/jive_wheel.c
Mon Jun 9 04:31:17 2008
@@ -224,14 +224,7 @@
unsigned int gpio;
int i, ret;
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
// we need to register at least one button and two relative axes
Modified:
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c?rev=2549&root=Jive&r1=2548&r2=2549&view=diff
==============================================================================
---
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
(original)
+++
7.1/trunk/squeezeos/src/s3c2412/linux-2.6.22/sound/soc/s3c24xx/jive_wm8750.c
Mon Jun 9 04:31:17 2008
@@ -257,14 +257,7 @@
printk("JIVE WM8750 Audio support\n");
- /* For compatibility with the old bootloader allow s3c2413 machines
- * to work here too. We can't use machine_is_s3c2413() here as that
- * machine is not configured in the kernel.
- *
- * The S3C2413 hack should be removed when the old bootloader has
- * been phased out.
- */
- if (!(machine_is_jive() || machine_arch_type == MACH_TYPE_S3C2413))
+ if (!machine_is_jive())
return 0;
jive_snd_device = platform_device_alloc("soc-audio", -1);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
