Fix compilation errors.

	* grub-core/term/ns8250.c (serial_get_divisor): Declare 'port' as
	potentially unused.
	* grub-core/loader/i386/linux.c (grub_linux_setup_video):
	Handle GRUB_VIDEO_DRIVER_SIS315PRO.
	* grub-core/bus/cs5536.c (grub_cs5536_init_geode): Restrict DIVIL init
	to loongson machines.

diff --git a/ChangeLog b/ChangeLog
index a2927df1166c4e986274c0b08cbcb903f23a0568..98418f4a02a6a4544f00b1964024fe89a1660158 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix compilation errors.
+
+       * grub-core/term/ns8250.c (serial_get_divisor): Declare 'port' as
+       potentially unused.
+       * grub-core/loader/i386/linux.c (grub_linux_setup_video):
+       Handle GRUB_VIDEO_DRIVER_SIS315PRO.
+       * grub-core/bus/cs5536.c (grub_cs5536_init_geode): Restrict DIVIL init
+       to loongson machines.
+
 2011-05-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Several FS mtime support.

diff --git a/grub-core/bus/cs5536.c b/grub-core/bus/cs5536.c
index f1a56425157a3e859027dd7302f3d8e51d326d1e..ae3c5c878529492a9ff4c29c956f5ecbf25176ff 100644 (file)
--- a/grub-core/bus/cs5536.c
+++ b/grub-core/bus/cs5536.c
@@ -269,6 +269,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
                         GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
 
   /* Setup DIVIL.  */
+#ifdef GRUB_MACHINE_MIPS_LOONGSON
   switch (grub_arch_machine)
     {
     case GRUB_ARCH_MACHINE_YEELOONG:
@@ -288,6 +289,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
                             | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
       break;
     }
+#endif
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
                         (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index f19f471ab82bcb8a0f186c64485e1a697049a5fe..dc2af4093c4b81728c4bb05692516dfedfd4d9d9 100644 (file)
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -367,6 +367,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
 
          /* FIXME: check if better id is available.  */
        case GRUB_VIDEO_DRIVER_SM712:
+       case GRUB_VIDEO_DRIVER_SIS315PRO:
        case GRUB_VIDEO_DRIVER_VGA:
        case GRUB_VIDEO_DRIVER_CIRRUS:
        case GRUB_VIDEO_DRIVER_BOCHS:

diff --git a/grub-core/term/ns8250.c b/grub-core/term/ns8250.c
index b63ee14d9ed8e34025f0e66919a33ff3a97390d1..996fc81f34ea1ef7811c90c5286f462fc45208b7 100644 (file)
--- a/grub-core/term/ns8250.c
+++ b/grub-core/term/ns8250.c
@@ -37,7 +37,7 @@ static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
 
 /* Convert speed to divisor.  */
 static unsigned short
-serial_get_divisor (const struct grub_serial_port *port,
+serial_get_divisor (const struct grub_serial_port *port __attribute__ ((unused)),
                    const struct grub_serial_config *config)
 {
   unsigned int i;